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

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

Author: ron.sigal at jboss.com
Date: 2009-05-15 17:50:07 -0400 (Fri, 15 May 2009)
New Revision: 5236

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

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java	2009-05-15 21:49:33 UTC (rev 5235)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java	2009-05-15 21:50:07 UTC (rev 5236)
@@ -73,7 +73,8 @@
       if (marshaller == null)
       {
          // try by locator (in case marshaller class name specified)
-         marshaller = MarshalFactory.getMarshaller(getLocator(), getClassLoader(), configuration);
+         Map map = passConfigMapToMarshalFactory ? configuration : null;
+         marshaller = MarshalFactory.getMarshaller(getLocator(), getClassLoader(), map);
          if (marshaller == null)
          {
             // need to have a marshaller, so create a default one
@@ -118,7 +119,8 @@
          }
          
          // try by locator (in case unmarshaller class name specified)
-         unmarshaller = MarshalFactory.getUnMarshaller(getLocator(), getClassLoader(), configuration);
+         Map map = passConfigMapToMarshalFactory ? configuration : null;
+         unmarshaller = MarshalFactory.getUnMarshaller(getLocator(), getClassLoader(), map);
          if (unmarshaller == null)
          {
             unmarshaller = MarshalFactory.getUnMarshaller(getDataType(), getSerializationType());