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

[dblevins]

Author: dblevins
Date: Thu Apr 15 08:13:04 2010
New Revision: 934324

URL: http://svn.apache.org/viewvc?rev=934324&view=rev
Log:
Call the addDiscoveryAgent method after the init() method is called

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

Modified: 
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?rev=934324&r1=934323&r2=934324&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
 (original)
+++ 
openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
 Thu Apr 15 08:13:04 2010
@@ -131,11 +131,6 @@ public abstract class ServiceManager {
 
                 service = (ServerService) 
recipe.create(serviceClass.getClassLoader());
 
-                if (service instanceof DiscoveryAgent){
-                    DiscoveryAgent agent = (DiscoveryAgent) service;
-                    registry.addDiscoveryAgent(agent);
-                }
-
                 if (!(service instanceof SelfManaging)) {
                     service = new ServicePool(service, serviceName, 
serviceProperties);
                     service = new ServiceLogger(service);
@@ -145,6 +140,11 @@ public abstract class ServiceManager {
 
                 service.init(serviceProperties);
                     
+                if (service instanceof DiscoveryAgent){
+                    DiscoveryAgent agent = (DiscoveryAgent) service;
+                    registry.addDiscoveryAgent(agent);
+                }
+
                 return service;
             } catch (Throwable t) {
                 logger.error("service.instantiation.err", t, 
serviceClass.getName(), t.getClass().getName(), t.getMessage());