[jboss-remoting-commits] JBoss Remoting SVN: r3514 - remoting2/branches/2.2/src/main/org/jboss/remoting/transport.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2008-02-26 01:35:40 -0500 (Tue, 26 Feb 2008)
New Revision: 3514

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java
Log:
JBREM-910: init() calls ServerInvoker.create() before ServerInvoker.getMBeanObjectName().

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java	2008-02-26 02:33:50 UTC (rev 3513)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/Connector.java	2008-02-26 06:35:40 UTC (rev 3514)
@@ -394,29 +394,8 @@
       {
          // create the server invoker
          invoker = InvokerRegistry.createServerInvoker(locator, configuration);
+         invoker.setMBeanServer(server);
 
-         // this will set the mbean server on the invoker and register it with mbean server
-         if (server != null)
-         {
-            try
-            {
-               ObjectName objName = new ObjectName(invoker.getMBeanObjectName());
-               if (!server.isRegistered(objName))
-               {
-                  server.registerMBean(invoker, objName);
-               }
-               else
-               {
-                  log.warn(objName + " is already registered with MBeanServer");
-               }
-               invoker.setMBeanServer(server);
-            }
-            catch (Throwable e)
-            {
-               log.warn("Error registering invoker " + invoker + " with MBeanServer.", e);
-            }
-         }
-
          // set the server socket factory if has been already set on the connector
          invoker.setServerSocketFactory(svrSocketFactory);
          // seting to null as don't want to keep reference in connector, but the server invoker
@@ -429,6 +408,27 @@
 
          invoker.create();
       }
+      
+      // this will set the mbean server on the invoker and register it with mbean server
+      if (server != null)
+      {
+         try
+         {
+            ObjectName objName = new ObjectName(invoker.getMBeanObjectName());
+            if (!server.isRegistered(objName))
+            {
+               server.registerMBean(invoker, objName);
+            }
+            else
+            {
+               log.warn(objName + " is already registered with MBeanServer");
+            }
+         }
+         catch (Throwable e)
+         {
+            log.warn("Error registering invoker " + invoker + " with MBeanServer.", e);
+         }
+      }
 
       // if using a generic locator (such as socket://localhost:0), the locator may change so
       // keep the local cache in synch