[jboss-remoting-commits] JBoss Remoting SVN: r5239 - 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-05-15 17:51:55 -0400 (Fri, 15 May 2009)
New Revision: 5239

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java
Log:
JBREM-1102: Uses passConfigMapToMarshalFactory variable.

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-05-15 21:51:16 UTC (rev 5238)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/transport/socket/ServerThread.java	2009-05-15 21:51:55 UTC (rev 5239)
@@ -27,6 +27,7 @@
 import org.jboss.remoting.InvocationRequest;
 import org.jboss.remoting.InvocationResponse;
 import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.Remoting;
 import org.jboss.remoting.ServerInvoker;
 import org.jboss.remoting.Version;
 import org.jboss.remoting.Client;
@@ -125,6 +126,8 @@
    private long lastRequestHandledTimestamp = System.currentTimeMillis();
    
    private boolean reuseAfterTimeout;
+   
+   private boolean passConfigMapToMarshalFactory;
 
    // Constructors ---------------------------------------------------------------------------------
 
@@ -159,6 +162,11 @@
          {
             shouldCheckConnection = true;
          }
+         checkValue = (String)configMap.get(Remoting.PASS_CONFIG_MAP_TO_MARSHAL_FACTORY);
+         if (checkValue != null && checkValue.length() > 0)
+         {
+            passConfigMapToMarshalFactory = Boolean.valueOf(checkValue).booleanValue();
+         }
       }
    }
 
@@ -812,9 +820,10 @@
          configMap = invoker.getConfiguration();
       }
       
+      Map map = passConfigMapToMarshalFactory ? configMap : null;
       if (unmarshaller == null)
       {
-         unmarshaller = MarshalFactory.getUnMarshaller(locator, classLoader, configMap);
+         unmarshaller = MarshalFactory.getUnMarshaller(locator, classLoader, map);
       }
       if (unmarshaller == null)
       {
@@ -823,7 +832,7 @@
 
       if (marshaller == null)
       {
-         marshaller = MarshalFactory.getMarshaller(locator, classLoader, configMap);
+         marshaller = MarshalFactory.getMarshaller(locator, classLoader, map);
       }
       if (marshaller == null)
       {