Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Jul 13, 2015 · 3737462 · 3737462
2 parents 0fbf579 + 5bbf470
commit 3737462
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DeleteTaskHandler.java
@@ -198,16 +198,21 @@ public <O extends ObjectType> TaskRunResult runInternal(Task task) {
             }
 
             SearchResultList<PrismObject<O>> objects;
-            do {
+            while (true) {
 
 	            objects = modelService.searchObjects(objectType, query, searchOptions, task, opResult);
 
+	            if (objects.isEmpty()) {
+	            	break;
+	            }
+
+	            int skipped = 0;
 	            for(PrismObject<O> object: objects) {
 
 	            	if (!optionRaw && ShadowType.class.isAssignableFrom(objectType) 
 	            			&& Boolean.TRUE == ((ShadowType)(object.asObjectable())).isProtectedObject()) {
 	            		LOGGER.debug("Skipping delete of protected object {}", object);
-	            		progress++;
+	            		skipped++;
 	            		continue;
 	            	}
 
@@ -222,7 +227,11 @@ public <O extends ObjectType> TaskRunResult runInternal(Task task) {
 	            	LOGGER.trace("Deleted {} objects, result:\n{}", progress, opResult.debugDump());
 	            }
 
-            } while (!objects.isEmpty());
+	            if (objects.size() == skipped) {
+	            	break;
+	            }
+
+            }
 
         } catch (ObjectAlreadyExistsException | ObjectNotFoundException | SchemaException
 				| ExpressionEvaluationException | ConfigurationException