Merge branch 'master' into connid-improvements-3.9

model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java

@@ -331,10 +331,11 @@ private void evaluateFromSegment(AssignmentPathSegmentImpl segment, PlusMinusZer
 		}
 
 		boolean isVirtual = isForcedAssignment(segment, ctx);
+		if (ctx.assignmentPath.isEmpty() && isVirtual) {
+			segment.setValidityOverride(isVirtual);
+		}
 
-		segment.setValidityOverride(isVirtual);
 		boolean isValid = (evaluateContent && evaluateSegmentContent(segment, relativeMode, ctx)) || isVirtual;
-
 
 		ctx.assignmentPath.removeLast(segment);
 		if (ctx.assignmentPath.isEmpty()) {		// direct assignment

model/model-intest/src/test/resources/lifecycle/role-croupier.xml

@@ -0,0 +1,28 @@
+<!--
+  ~ Copyright (c) 2018 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<role oid="a7b8de9a-20a1-84f6-b452-01254a1256e3"
+        xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3"
+        xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/10000000-0000-0000-0000-000000000004"
+        xmlns:piracy="http://midpoint.evolveum.com/xml/ns/samples/piracy">
+    <name>Croupier</name>
+    <description>This is non-employee role. It does NOT work as data processing basis.</description>
+    <!-- No roleType -->
+    <authorization>
+    	<action>http://midpoint.evolveum.com/xml/ns/test/authorization#croupier</action>
+    </authorization>
+</role>