Fixing NPE related to lockout processing

Evolveum · Apr 11, 2016 · ea1c919 · ea1c919
1 parent ce75726
commit ea1c919
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/...el-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java b/...el-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/FocusProcessor.java
@@ -523,18 +523,21 @@ private <F extends FocusType> void processActivationLockout(LensFocusContext<Use
 			OperationResult result) 
 			throws ExpressionEvaluationException, ObjectNotFoundException, SchemaException, PolicyViolationException {	
 
-		PropertyDelta<LockoutStatusType> lockoutStatusDelta = focusContext.getPrimaryDelta().findPropertyDelta(SchemaConstants.PATH_ACTIVATION_LOCKOUT_STATUS);
-		if (lockoutStatusDelta != null) {
-			if (lockoutStatusDelta.isAdd()) {
-				for (PrismPropertyValue<LockoutStatusType> pval: lockoutStatusDelta.getValuesToAdd()) {
-					if (pval.getValue() == LockoutStatusType.LOCKED) {
-						throw new SchemaException("Lockout status cannot be changed to LOCKED value");
+		ObjectDelta<UserType> focusPrimaryDelta = focusContext.getPrimaryDelta();
+		if (focusPrimaryDelta != null) {
+			PropertyDelta<LockoutStatusType> lockoutStatusDelta = focusContext.getPrimaryDelta().findPropertyDelta(SchemaConstants.PATH_ACTIVATION_LOCKOUT_STATUS);
+			if (lockoutStatusDelta != null) {
+				if (lockoutStatusDelta.isAdd()) {
+					for (PrismPropertyValue<LockoutStatusType> pval: lockoutStatusDelta.getValuesToAdd()) {
+						if (pval.getValue() == LockoutStatusType.LOCKED) {
+							throw new SchemaException("Lockout status cannot be changed to LOCKED value");
+						}
 					}
-				}
-			} else if (lockoutStatusDelta.isReplace()) {
-				for (PrismPropertyValue<LockoutStatusType> pval: lockoutStatusDelta.getValuesToReplace()) {
-					if (pval.getValue() == LockoutStatusType.LOCKED) {
-						throw new SchemaException("Lockout status cannot be changed to LOCKED value");
+				} else if (lockoutStatusDelta.isReplace()) {
+					for (PrismPropertyValue<LockoutStatusType> pval: lockoutStatusDelta.getValuesToReplace()) {
+						if (pval.getValue() == LockoutStatusType.LOCKED) {
+							throw new SchemaException("Lockout status cannot be changed to LOCKED value");
+						}
 					}
 				}
 			}