Project

General

Profile

« Previous | Next » 

Revision 07655893

Added by Katja Luther over 8 years ago

minor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmObjectTransfer.java
37 37
	 */
38 38
	@Override
39 39
	protected void javaToNative(Object object, TransferData transferData) {
40
		byte[] bytes = toByteArray((T[]) object);
41
		if (bytes != null)
42
			super.javaToNative(bytes, transferData);
40
		if (object != null){
41
			byte[] bytes = toByteArray((T[]) object);
42
			if (bytes != null)
43
				super.javaToNative(bytes, transferData);
44
		}
43 45
	}
44 46
	
45 47
	/* (non-Javadoc)
......
48 50
	@Override
49 51
	protected Object nativeToJava(TransferData transferData) {
50 52
		byte[] bytes = (byte[]) super.nativeToJava(transferData);
51
		return fromByteArray(bytes);
53
		if (bytes != null){
54
			return fromByteArray(bytes);
55
		}
56
		return null;
52 57
	}
58
		
53 59
	
54 60
	protected byte[] toByteArray(T[] elements) {
55 61
		ByteArrayOutputStream byteOut = new ByteArrayOutputStream();

Also available in: Unified diff