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

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

Author: ron.sigal at jboss.com
Date: 2009-03-23 23:45:24 -0400 (Mon, 23 Mar 2009)
New Revision: 4898

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java
Log:
JBREM-1102: Uses configuration when it calls MarshalFactory.getMarshaller() and MarshalFactory.getUnMarshaller().

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java	2009-03-24 03:44:39 UTC (rev 4897)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java	2009-03-24 03:45:24 UTC (rev 4898)
@@ -806,9 +806,15 @@
 
       //TODO: -TME Need better way to get the unmarshaller (via config)
 
+      Map configMap = null;
+      if (invoker != null)
+      {
+         configMap = invoker.getConfiguration();
+      }
+      
       if (unmarshaller == null)
       {
-         unmarshaller = MarshalFactory.getUnMarshaller(locator, classLoader);
+         unmarshaller = MarshalFactory.getUnMarshaller(locator, classLoader, configMap);
       }
       if (unmarshaller == null)
       {
@@ -817,7 +823,7 @@
 
       if (marshaller == null)
       {
-         marshaller = MarshalFactory.getMarshaller(locator, classLoader);
+         marshaller = MarshalFactory.getMarshaller(locator, classLoader, configMap);
       }
       if (marshaller == null)
       {