hotfix NPE

#392 (cherry picked from commit a397b0a)
metasfresh · May 19, 2017 · cad8d45 · cad8d45
1 parent 5773cf1
commit cad8d45
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/de/metas/ui/web/process/adprocess/ADProcessParametersRepository.java b/src/main/java/de/metas/ui/web/process/adprocess/ADProcessParametersRepository.java
@@ -130,11 +130,18 @@ public Document createNewDocument(final DocumentEntityDescriptor parametersDescr
 
 	Document createNewParametersDocument(final DocumentEntityDescriptor parametersDescriptor, final DocumentId adPInstanceId, final IDocumentEvaluatee evalCtx)
 	{
+		final IDocumentEvaluatee evalCtxEffective;
+		if(evalCtx != null)
+		{
+			evalCtxEffective = evalCtx.excludingFields(WindowConstants.FIELDNAME_Processed, WindowConstants.FIELDNAME_Processing, WindowConstants.FIELDNAME_IsActive);
+		}
+		else
+		{
+			evalCtxEffective = null;
+		}
+
 		return Document.builder(parametersDescriptor)
-				.setShadowParentDocumentEvaluatee(evalCtx.excludingFields(
-						WindowConstants.FIELDNAME_Processed,
-						WindowConstants.FIELDNAME_Processing,
-						WindowConstants.FIELDNAME_IsActive))
+				.setShadowParentDocumentEvaluatee(evalCtxEffective)
 				.initializeAsNewDocument(adPInstanceId, VERSION_DEFAULT);
 	}