[jbossws-commits] JBossWS SVN: r3820 - branches/maeste_palin/jbossws-core/src/main/java/org/jboss/ws/core/client.

[jbossws-commits at lists.jboss.org]

Author: palin
Date: 2007-07-08 04:58:41 -0400 (Sun, 08 Jul 2007)
New Revision: 3820

Modified:
   branches/maeste_palin/jbossws-core/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
Log:
[JBWS-1704] Removed registration of marshaller/unmarshaller into MarshallFactory required for old jboss remoting 1.4.5


Modified: branches/maeste_palin/jbossws-core/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java
===================================================================
--- branches/maeste_palin/jbossws-core/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java	2007-07-07 14:30:16 UTC (rev 3819)
+++ branches/maeste_palin/jbossws-core/src/main/java/org/jboss/ws/core/client/RemotingConnectionImpl.java	2007-07-08 08:58:41 UTC (rev 3820)
@@ -40,7 +40,6 @@
 import org.jboss.logging.Logger;
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.marshal.MarshalFactory;
 import org.jboss.remoting.marshal.Marshaller;
 import org.jboss.remoting.marshal.UnMarshaller;
 import org.jboss.ws.core.CommonMessageContext;
@@ -218,23 +217,13 @@
       {
          // Get the invoker from Remoting for a given endpoint address
          log.debug("Get locator for: " + endpoint);
-         targetAddress = addURLParameter(targetAddress, InvokerLocator.DATATYPE, "JBossWSMessage");
-         InvokerLocator locator = new InvokerLocator(targetAddress);
 
-         /* An HTTPClientInvoker may disconnect from the server and recreated by the remoting layer.
-          * In that case the new invoker does not inherit the marshaller/unmarshaller from the disconnected invoker.
-          * We therefore explicitly specify the invoker locator datatype and register the SOAP marshaller/unmarshaller
-          * with the MarshalFactory. 
-          * 
-          * This applies to remoting-1.4.5 
-          */
          Marshaller marshaller = getMarshaller();
          UnMarshaller unmarshaller = getUnmarshaller();
-         MarshalFactory.addMarshaller("JBossWSMessage", marshaller, unmarshaller);
 
+         InvokerLocator locator = new InvokerLocator(targetAddress);
          client = new Client(locator, "jbossws", clientConfig);
          client.connect();
-
          client.setMarshaller(marshaller);
 
          if (oneway == false)