X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.server%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fweb%2Fmvc%2Fresult%2FRemoveResultFromCollectionController.java;h=b49bed4acb417e42d5b97e880d0dc10d419063d6;hb=1d1bc92e4aef2b8b889d7482f91b7ed905f0fb47;hp=3f4f52e485b41963f83d370e17c06b9eb82e95cd;hpb=b57f27c766e4ce01990cff3398b9aaf8454ed5d9;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java
index 3f4f52e48..b49bed4ac 100644
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/web/mvc/result/RemoveResultFromCollectionController.java
@@ -1,5 +1,8 @@
 package org.argeo.slc.web.mvc.result;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -7,7 +10,7 @@ import org.argeo.slc.SlcException;
 import org.argeo.slc.core.test.tree.TreeTestResult;
 import org.argeo.slc.core.test.tree.TreeTestResultCollection;
 import org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao;
-import org.argeo.slc.services.test.TestManagerService;
+import org.argeo.slc.services.TestManagerService;
 import org.argeo.slc.web.mvc.AbstractServiceController;
 import org.springframework.util.PatternMatchUtils;
 import org.springframework.web.servlet.ModelAndView;
@@ -55,8 +58,9 @@ public class RemoveResultFromCollectionController extends
 			for (String attrName : attrNames) {
 				String attrPattern = attrPatterns[index];// safe: checked above
 
-				for (TreeTestResult treeTestResult : sourceCollection
-						.getResults()) {
+				List<TreeTestResult> results = new ArrayList<TreeTestResult>(
+						sourceCollection.getResults());
+				for (TreeTestResult treeTestResult : results) {
 					if (PatternMatchUtils.simpleMatch(attrPattern,
 							treeTestResult.getAttributes().get(attrName))) {
 						testManagerService.removeResultFromCollection(
@@ -71,8 +75,9 @@ public class RemoveResultFromCollectionController extends
 				// TODO: optimize
 				TreeTestResultCollection sourceCollection = testResultCollectionDao
 						.getTestResultCollection(collectionId);
-				for (TreeTestResult treeTestResult : sourceCollection
-						.getResults()) {
+				List<TreeTestResult> results = new ArrayList<TreeTestResult>(
+						sourceCollection.getResults());
+				for (TreeTestResult treeTestResult : results) {
 					testManagerService.removeResultFromCollection(collectionId,
 							treeTestResult.getUuid());
 				}