[wsas-java-dev] svn commit r226 - wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service

[svn at wso2.com]

Author: azeez
Date: Thu Dec 14 21:10:19 2006
New Revision: 226

Modified:
   wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
Log:
Fix for WSAS-171



Modified: wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	(original)
+++ wsas/java/trunk/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	Thu Dec 14 21:10:19 2006
@@ -736,13 +736,18 @@
         }
         axisService.getPolicyInclude().removePolicyElement(policyId);
         ServiceDO serviceDO = pm.getService(serviceId, version);
+        List policiesToBeRemoved = new ArrayList();
         for (Iterator policyIter = serviceDO.getPolicies().iterator();
              policyIter.hasNext();) {
             ServicePolicyDO servicePolicyDO = (ServicePolicyDO) policyIter.next();
             if (servicePolicyDO.getUuid().equals(policyId)) {
-                serviceDO.getPolicies().remove(servicePolicyDO);
+                policiesToBeRemoved.add(servicePolicyDO);
             }
         }
+        Set policies = serviceDO.getPolicies();
+        for (Iterator iterator = policiesToBeRemoved.iterator(); iterator.hasNext();) {
+            policies.remove(iterator.next());
+        }
         pm.updateEntity(serviceDO);
     }