svn commit: r1296866 - /openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

[rmannibucau]

Author: rmannibucau
Date: Sun Mar  4 19:56:15 2012
New Revision: 1296866

URL: http://svn.apache.org/viewvc?rev=1296866&view=rev
Log:
little refactoring on ServiceManager to filter in a better place

Modified:
    
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java

Modified: 
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=1296866&r1=1296865&r2=1296866&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
 Sun Mar  4 19:56:15 2012
@@ -72,13 +72,14 @@ public abstract class ServiceManager {
         throws IOException {
         List<ServerService> enabledServers = new ArrayList<ServerService>();
 
-        for (Iterator iterator = availableServices.entrySet().iterator(); 
iterator.hasNext();) {
-            Map.Entry entry = (Map.Entry) iterator.next();
-            String serviceName = (String) entry.getKey();
-            Properties serviceProperties = (Properties) entry.getValue();
-            
-            ServerService service = initServer(serviceName, serviceProperties);
-            if (service != null && accept(service.getName())) {
+        for (Map.Entry<String, Properties> serviceInfo : 
availableServices.entrySet()) {
+            final String serviceName = serviceInfo.getKey();
+            if (!accept(serviceName)) {
+                continue;
+            }
+
+            ServerService service = initServer(serviceName, 
serviceInfo.getValue());
+            if (service != null) {
                 enabledServers.add(service);
             }
         }