Fixing two authorization NPE problems

Evolveum · Feb 4, 2015 · 01e4acc · 01e4acc
1 parent 41c48ad
commit 01e4acc
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java b/...model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
@@ -1622,6 +1622,9 @@ private <T extends ObjectType> void postProcessObject(PrismObject<T> object, Get
 	}
 
 	private void removeDeniedItems(List<Item<? extends PrismValue>> items, ObjectSecurityConstraints securityContraints, AuthorizationDecisionType defaultDecision) {
+		if (items == null) {
+			return;
+		}
 		Iterator<Item<?>> iterator = items.iterator();
 		while (iterator.hasNext()) {
 			Item<? extends PrismValue> item = iterator.next();
@@ -1643,9 +1646,11 @@ private void removeDeniedItems(List<Item<? extends PrismValue>> items, ObjectSec
 					while (vi.hasNext()) {
 						PrismContainerValue<?> cval = vi.next();
 						List<Item<?>> subitems = cval.getItems();
-						removeDeniedItems(subitems, securityContraints, subDefaultDecision);
-						if (cval.getItems().isEmpty()) {
-							vi.remove();
+						if (subitems != null) {
+							removeDeniedItems(subitems, securityContraints, subDefaultDecision);
+							if (subitems.isEmpty()) {
+								vi.remove();
+							}
 						}
 					}
 					if (item.isEmpty()) {