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

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

Author: ron.sigal at jboss.com
Date: 2008-06-19 21:25:46 -0400 (Thu, 19 Jun 2008)
New Revision: 4296

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java
Log:
JBREM-962: MarshallerLoaderHandler gets repositories set and MBeanServer.

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java	2008-06-20 01:23:12 UTC (rev 4295)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/marshal/MarshallLoaderFactory.java	2008-06-20 01:25:46 UTC (rev 4296)
@@ -24,6 +24,10 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
+
+import javax.management.MBeanServer;
+
 import org.jboss.logging.Logger;
 import org.jboss.remoting.InvokerLocator;
 import org.jboss.remoting.transport.Connector;
@@ -43,9 +47,11 @@
     * listen on.  Will return null if can not create the connector.
     *
     * @param locator
+    * @param repositories
+    * @param mbeanServer
     * @return
     */
-   public static Connector createMarshallLoader(InvokerLocator locator)
+   public static Connector createMarshallLoader(InvokerLocator locator, Set repositories, MBeanServer mbeanServer)
    {
       Connector marshallerConnector = null;
       try
@@ -54,8 +60,11 @@
          marshallerConnector.setInvokerLocator(locator.getLocatorURI());
          marshallerConnector.start();
 
-         MarshallerLoaderHandler loader = new MarshallerLoaderHandler();
+         MarshallerLoaderHandler loader = new MarshallerLoaderHandler(repositories);
          marshallerConnector.addInvocationHandler("loader", loader);
+         
+         // Set after Connector.addInvocationHandler(), which also sets MBeanServer.
+         loader.setMBeanServer(mbeanServer);
       }
       catch(Exception e)
       {