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

[Ron Sigal]

  User: rsigal  
  Date: 07/05/09 04:39:26

  Modified:    src/main/org/jboss/remoting/transport/rmi  Tag:
                        remoting_2_2_0_GA RMIClientInvoker.java
  Log:
  JBREM-714: Added special handling for VersionedMarshaller.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.1.4.1 +7 -2      JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RMIClientInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RMIClientInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RMIClientInvoker.java,v
  retrieving revision 1.9.2.1
  retrieving revision 1.9.2.1.4.1
  diff -u -b -r1.9.2.1 -r1.9.2.1.4.1
  --- RMIClientInvoker.java	16 Jan 2007 06:19:04 -0000	1.9.2.1
  +++ RMIClientInvoker.java	9 May 2007 08:39:26 -0000	1.9.2.1.4.1
  @@ -29,9 +29,11 @@
   import org.jboss.remoting.InvokerLocator;
   import org.jboss.remoting.RemoteClientInvoker;
   import org.jboss.remoting.Remoting;
  +import org.jboss.remoting.Version;
   import org.jboss.remoting.marshal.Marshaller;
   import org.jboss.remoting.marshal.MarshallerDecorator;
   import org.jboss.remoting.marshal.UnMarshaller;
  +import org.jboss.remoting.marshal.VersionedMarshaller;
   import org.jboss.remoting.marshal.rmi.RMIMarshaller;
   
   import java.io.ByteArrayInputStream;
  @@ -50,7 +52,7 @@
    *
    * @author <a href="mailto:jhaynie at vocalocity.net">Jeff Haynie</a>
    * @author <a href="mailto:telrod at vocalocity.net">Tom Elrod</a>
  - * @version $Revision: 1.9.2.1 $
  + * @version $Revision: 1.9.2.1.4.1 $
    */
   public class RMIClientInvoker extends RemoteClientInvoker
   {
  @@ -211,6 +213,9 @@
               else
               {
                  ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
  +               if (marshaller instanceof VersionedMarshaller)
  +                  ((VersionedMarshaller) marshaller).write(payload, byteOut, Version.getDefaultVersion());
  +               else
                  marshaller.write(payload, byteOut);
                  ByteArrayInputStream byteIn = new ByteArrayInputStream(byteOut.toByteArray());
                  ObjectInputStream ois = new ObjectInputStream(byteIn);