Merge branch 'post-3.7-fixes' into support-3.7

Evolveum · Jan 31, 2018 · 0ab1777 · 0ab1777
2 parents 5e7983b + 96d2df5
commit 0ab1777
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
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
@@ -765,6 +765,7 @@ private <F extends FocusType, V extends PrismValue, D extends ItemDefinition> vo
     	variables.addVariableDefinition(ExpressionConstants.VAR_ACCOUNT, accountNew);
     	variables.addVariableDefinition(ExpressionConstants.VAR_SHADOW, accountNew);
     	variables.addVariableDefinition(ExpressionConstants.VAR_RESOURCE, resource);
+    	variables.addVariableDefinition(ExpressionConstants.VAR_CONFIGURATION, context.getSystemConfiguration());
     	variables.addVariableDefinition(ExpressionConstants.VAR_OPERATION, context.getFocusContext().getOperation().getValue());
 
     	Source<V,D> defaultSource = new Source<>(oldAccountProperty, attributeAPrioriDelta, null, ExpressionConstants.VAR_INPUT);

diff --git a/model/model-intest/src/test/resources/common/resource-dummy-green.xml b/model/model-intest/src/test/resources/common/resource-dummy-green.xml
@@ -132,8 +132,12 @@
 				<inbound>
 					<strength>strong</strength>
 					<expression>
-						<script>
-							<code>'The crew of ' + input</code>
+						<script><!-- MID-4405 -->
+							<code>
+								assert configuration != null : 'no configuration'
+								assert configuration.getLogging() != null : 'no logging in configuration'
+								'The crew of ' + input
+							</code>
 						</script>
 					</expression>
 					<target>