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

[svn at wso2.org]

Author: azeez
Date: Sun Jul  1 23:53:40 2007
New Revision: 4622

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

Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	(original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java	Sun Jul  1 23:53:40 2007
@@ -1230,15 +1230,13 @@
         }
 
         String fileName = "";
+        List serviceToBeRemoved = new ArrayList();
         for (Iterator serviceIter = asGroup.getServices(); serviceIter.hasNext();) {
             AxisService axisService = (AxisService) serviceIter.next();
-
             URL fn = axisService.getFileName();
-
             if (fn != null) {
                 fileName = fn.getPath();
             }
-
             if ((fileName != null) && (fileName.trim().length() != 0)) {
                 File file = new File(fileName);
                 if (file.exists()) {
@@ -1250,10 +1248,12 @@
                     }
                 }
             }
-            axisConfig.removeService(axisService.getName());
+            serviceToBeRemoved.add(axisService.getName());
             //NOTE: The DeploymentInterceptor will handle removing the service from the DB
         }
-
+        for (Iterator iterator = serviceToBeRemoved.iterator(); iterator.hasNext();) {
+            axisConfig.removeService((String) iterator.next());
+        }
         axisConfig.removeServiceGroup(asGroup.getServiceGroupName());
         return false;
     }