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 40d8e197ba1f42e0d0756b389b36f4a3d67c2403..3506523e34240a3a42642dda0fed1e8f95f99e0d 100644 (file)
--- 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();