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

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

Author: ron.sigal at jboss.com
Date: 2011-01-24 22:51:57 -0500 (Mon, 24 Jan 2011)
New Revision: 6218

Modified:
   remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerRegistry.java
Log:
JBREM-1268: Associates new client invoker with original configuration map, instead of one possibly changed by RemoteClientInvoker.

Modified: remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerRegistry.java
===================================================================
--- remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerRegistry.java	2011-01-25 03:49:13 UTC (rev 6217)
+++ remoting2/branches/2.2/src/main/org/jboss/remoting/InvokerRegistry.java	2011-01-25 03:51:57 UTC (rev 6218)
@@ -285,6 +285,12 @@
             return invoker;
          }
 
+         Map orginalConfiguration = null; 
+         if(configuration != null)
+         {
+            orginalConfiguration = new HashMap(configuration);
+         }
+         
          boolean isForceRemote = false;
          boolean isPassByValue = false;
          Map parameters = locator.getParameters();
@@ -333,7 +339,7 @@
                invoker = localInvoker;
                InvokerLocator l = invoker.getLocator();
 
-               addRegisteredClientInvoker(invoker, l, configuration);
+               addRegisteredClientInvoker(invoker, l, orginalConfiguration);
             }
          }
          
@@ -349,7 +355,7 @@
 
             InvokerLocator l = invoker.getLocator();
 
-            addRegisteredClientInvoker(invoker, l, configuration);
+            addRegisteredClientInvoker(invoker, l, orginalConfiguration);
          }
          return invoker;
       }