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

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

Author: ron.sigal at jboss.com
Date: 2009-05-16 20:38:01 -0400 (Sat, 16 May 2009)
New Revision: 5253

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

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java	2009-05-17 00:23:16 UTC (rev 5252)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/MicroRemoteClientInvoker.java	2009-05-17 00:38:01 UTC (rev 5253)
@@ -86,7 +86,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
@@ -105,7 +106,8 @@
          if (unmarshaller == null)
          {
             // 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());