From: Katja Luther <k.luther@bgbm.org>
Date: Mon, 16 Nov 2015 13:39:47 +0000 (+0100)
Subject: minor
X-Git-Tag: 3.12.0^2~62^2~5
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/07655893d3b22b2ab23182d67ead5e24021a5bcd

minor
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmObjectTransfer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmObjectTransfer.java
index 40d8e197b..3506523e3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmObjectTransfer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmObjectTransfer.java
@@ -37,9 +37,11 @@ public abstract class CdmObjectTransfer<T extends ICdmBase> extends ByteArrayTra
 	 */
 	@Override
 	protected void javaToNative(Object object, TransferData transferData) {
-		byte[] bytes = toByteArray((T[]) object);
-		if (bytes != null)
-			super.javaToNative(bytes, transferData);
+		if (object != null){
+			byte[] bytes = toByteArray((T[]) object);
+			if (bytes != null)
+				super.javaToNative(bytes, transferData);
+		}
 	}
 	
 	/* (non-Javadoc)
@@ -48,8 +50,12 @@ public abstract class CdmObjectTransfer<T extends ICdmBase> extends ByteArrayTra
 	@Override
 	protected Object nativeToJava(TransferData transferData) {
 		byte[] bytes = (byte[]) super.nativeToJava(transferData);
-		return fromByteArray(bytes);
+		if (bytes != null){
+			return fromByteArray(bytes);
+		}
+		return null;
 	}
+		
 	
 	protected byte[] toByteArray(T[] elements) {
 		ByteArrayOutputStream byteOut = new ByteArrayOutputStream();