Make field handler more robust

[gpl/argeo-slc.git] / runtime / org.argeo.slc.support.castor / src / main / java / org / argeo / slc / castor / execution / PrimitiveFieldHandler.java

diff --git a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java
index bee2acb66ca2c7f762660f6bbd8fcf2bfeb28afa..0df1a49bab65869f1d090f1fd171db924a6cc57d 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java
+++ b/runtime/org.argeo.slc.support.castor/src/main/java/org/argeo/slc/castor/execution/PrimitiveFieldHandler.java
@@ -11,7 +11,8 @@ public class PrimitiveFieldHandler extends AbstractFieldHandler {
                if (object == null)
                        return null;
 
-               return ((PrimitiveAccessor) object).getValue().toString();
+               Object value = ((PrimitiveAccessor) object).getValue();
+               return value != null ? value.toString() : null;
        }
 
        @Override