[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/socket ...

[Ron Sigal]

  User: rsigal  
  Date: 07/01/29 00:27:53

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_x MicroSocketClientInvoker.java
  Log:
  JBREM-692:  Passes marshaller/unmarshaller to ClientSocketWrapper.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.14 +20 -6     JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MicroSocketClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/socket/MicroSocketClientInvoker.java,v
  retrieving revision 1.16.2.13
  retrieving revision 1.16.2.14
  diff -u -b -r1.16.2.13 -r1.16.2.14
  --- MicroSocketClientInvoker.java	26 Jan 2007 07:57:01 -0000	1.16.2.13
  +++ MicroSocketClientInvoker.java	29 Jan 2007 05:27:53 -0000	1.16.2.14
  @@ -33,7 +33,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  - * @version $Revision: 1.16.2.13 $
  + * @version $Revision: 1.16.2.14 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -347,7 +347,7 @@
         {
            try
            {
  -            socketWrapper = getConnection();
  +            socketWrapper = getConnection(marshaller, unmarshaller);
            }
            catch (Exception e)
            {
  @@ -693,7 +693,7 @@
       */
      static int counter = 0;
   
  -   protected SocketWrapper getConnection() throws Exception
  +   protected SocketWrapper getConnection(Marshaller marshaller, UnMarshaller unmarshaller) throws Exception
      {
         SocketWrapper pooled = null;
   
  @@ -764,7 +764,20 @@
                  }
                  socket.setTcpNoDelay(address.enableTcpNoDelay);
                  socket.setReuseAddress(reuseAddress);
  -               pooled = createClientSocket(socket, address.timeout, getLocator().getParameters());
  +               
  +               Map metadata = getLocator().getParameters();
  +               if (metadata == null)
  +               {
  +                  metadata = new HashMap(2);
  +               }
  +               else
  +               {
  +                  metadata = new HashMap(metadata);
  +               }
  +               metadata.put(SocketWrapper.MARSHALLER, marshaller);
  +               metadata.put(SocketWrapper.UNMARSHALLER, unmarshaller);
  +               
  +               pooled = createClientSocket(socket, address.timeout, metadata);
                  usedPooled++;
                  break;
               }
  @@ -793,12 +806,13 @@
               clientSocketClass = ClassLoaderUtility.loadClass(clientSocketClassName, getClass());
            }
   
  -         clientSocketConstructor = clientSocketClass.getConstructor(new Class[]{Socket.class});
  +         Class[] args = new Class[]{Socket.class, Map.class, Integer.class};
  +         clientSocketConstructor = clientSocketClass.getConstructor(args);
   
         }
   
         SocketWrapper clientSocketWrapper = null;
  -      clientSocketWrapper = (SocketWrapper) clientSocketConstructor.newInstance(new Object[]{socket});
  +      clientSocketWrapper = (SocketWrapper) clientSocketConstructor.newInstance(new Object[]{socket, metadata, new Integer(timeout)});
   
         return clientSocketWrapper;
      }