Fixing NPE in PrismMarshaller

Evolveum · Jun 7, 2017 · d54a7c5 · d54a7c5
1 parent e4dce49
commit d54a7c5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/PrismMarshaller.java
@@ -404,7 +404,7 @@ private <T> XNode serializePropertyValue(@NotNull PrismPropertyValue<T> value, P
             return serializePolyString((PolyString) realValue);
         } else if (beanMarshaller.canProcess(typeName)) {
             XNode xnode = beanMarshaller.marshall(realValue);
-            if (realValue.getClass().getPackage() != null) {
+            if (realValue != null && realValue.getClass().getPackage() != null) {
 				TypeDefinition typeDef = getSchemaRegistry()
 						.findTypeDefinitionByCompileTimeClass(realValue.getClass(), TypeDefinition.class);
 				if (xnode != null && typeDef != null && !QNameUtil.match(typeDef.getTypeName(), typeName)) {