Add $projection variable where it was missing

(cherry picked from commit 286b0dc)
Evolveum · Jul 6, 2018 · a5e8b2d · a5e8b2d
1 parent e309900
commit a5e8b2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.java
@@ -531,6 +531,7 @@ private <F extends FocusType> boolean evaluateExistenceMapping(final LensContext
 
 			// Variable: shadow
 			builder.addVariableDefinition(ExpressionConstants.VAR_SHADOW, projCtx.getObjectDeltaObject());
+			builder.addVariableDefinition(ExpressionConstants.VAR_PROJECTION, projCtx.getObjectDeltaObject());
 
 			// Variable: resource
 			builder.addVariableDefinition(ExpressionConstants.VAR_RESOURCE, projCtx.getResource());

diff --git a/...src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java b/...src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java
@@ -753,9 +753,9 @@ private <F extends FocusType, V extends PrismValue, D extends ItemDefinition> vo
     	ExpressionVariables variables = new ExpressionVariables();
     	variables.addVariableDefinition(ExpressionConstants.VAR_USER, focusNew);
     	variables.addVariableDefinition(ExpressionConstants.VAR_FOCUS, focusNew);
-		variables.addVariableDefinition(ExpressionConstants.VAR_PROJECTION, accountNew);
     	variables.addVariableDefinition(ExpressionConstants.VAR_ACCOUNT, accountNew);
     	variables.addVariableDefinition(ExpressionConstants.VAR_SHADOW, accountNew);
+    	variables.addVariableDefinition(ExpressionConstants.VAR_PROJECTION, accountNew);
     	variables.addVariableDefinition(ExpressionConstants.VAR_RESOURCE, resource);
     	variables.addVariableDefinition(ExpressionConstants.VAR_CONFIGURATION, context.getSystemConfiguration());
     	variables.addVariableDefinition(ExpressionConstants.VAR_OPERATION, context.getFocusContext().getOperation().getValue());