Merge branch 'master' into devel-3.c

Evolveum · Mar 29, 2017 · 2f60b3c · 2f60b3c
2 parents 24ca31c + 426666a
commit 2f60b3c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/...-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java b/...-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java
@@ -359,7 +359,6 @@ public <V extends PrismValue, D extends ItemDefinition, T extends ObjectType, F
 				if (aPrioriTargetObject != null && mappingOutputPath != null) {
 					aPrioriTargetItem = aPrioriTargetObject.findItem(mappingOutputPath);
 				}
-				LOGGER.info("PPPPPPPPPPP aPrioriTargetItem: {}", aPrioriTargetItem);
 				if (hasNoValue(aPrioriTargetItem)) {
 
 					mappingOutputStruct.setWeakMappingWasUsed(true);

diff --git a/model/model-intest/src/test/resources/password/resource-dummy-lifecycle.xml b/model/model-intest/src/test/resources/password/resource-dummy-lifecycle.xml
@@ -82,14 +82,11 @@
             	<lifecycleState>
             		<outbound>
             			<name>lifecycle-lifecycle</name>
-            			<trace>true</trace>
             			<source>
             				<path>employeeType</path>
             			</source>
             			<expression>
-            				<trace>true</trace>
             				<script>
-            					<trace>true</trace>
             					<code>
             						if (employeeType == 'WRECK') {
             							return 'archived';