[jboss-remoting-commits] JBoss Remoting SVN: r3530 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport.

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

Author: ron.sigal at jboss.com
Date: 2008-02-27 19:46:09 -0500 (Wed, 27 Feb 2008)
New Revision: 3530

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

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java	2008-02-28 00:44:18 UTC (rev 3529)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/Connector.java	2008-02-28 00:46:09 UTC (rev 3530)
@@ -411,7 +411,20 @@
       {
          // create the server invoker
          invoker = InvokerRegistry.createServerInvoker(locator, configuration);
+         invoker.setMBeanServer(server);
 
+         // 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
+         // see JBREM-367
+         this.svrSocketFactory = null;
+
+         // set the socket factory if has been already set on the connector
+         invoker.setSocketFactory(socketFactory);
+         this.socketFactory = null;
+
+         invoker.create();
+         
          // this will set the mbean server on the invoker and register it with mbean server
          if (server != null)
          {
@@ -426,25 +439,12 @@
                {
                   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
-         // see JBREM-367
-         this.svrSocketFactory = null;
-
-         // set the socket factory if has been already set on the connector
-         invoker.setSocketFactory(socketFactory);
-         this.socketFactory = null;
-
-         invoker.create();
       }
 
       // if using a generic locator (such as socket://localhost:0), the locator may change so