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

[Ron Sigal]

  User: rsigal  
  Date: 07/05/09 04:43:13

  Modified:    src/main/org/jboss/remoting/transport/socket  Tag:
                        remoting_2_2_0_GA MicroSocketClientInvoker.java
  Log:
  JBREM-714: Added special handling for VersionedMarshalle/VersionedUnMarshallerr.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.16.2.26.2.1 +11 -3     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.26
  retrieving revision 1.16.2.26.2.1
  diff -u -b -r1.16.2.26 -r1.16.2.26.2.1
  --- MicroSocketClientInvoker.java	20 Mar 2007 03:18:42 -0000	1.16.2.26
  +++ MicroSocketClientInvoker.java	9 May 2007 08:43:13 -0000	1.16.2.26.2.1
  @@ -10,6 +10,8 @@
   import org.jboss.remoting.serialization.ClassLoaderUtility;
   import org.jboss.remoting.marshal.Marshaller;
   import org.jboss.remoting.marshal.UnMarshaller;
  +import org.jboss.remoting.marshal.VersionedMarshaller;
  +import org.jboss.remoting.marshal.VersionedUnMarshaller;
   import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
   import org.jboss.util.propertyeditor.PropertyEditors;
   
  @@ -36,7 +38,7 @@
    * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    *
  - * @version $Revision: 1.16.2.26 $
  + * @version $Revision: 1.16.2.26.2.1 $
    */
   public class MicroSocketClientInvoker extends RemoteClientInvoker
   {
  @@ -934,6 +936,9 @@
            case Version.VERSION_2_2:
            {
               if (trace) { log.trace(this + " reading response from unmarshaller"); }
  +            if (unmarshaller instanceof VersionedUnMarshaller)
  +               return((VersionedUnMarshaller)unmarshaller).read(inputStream, null, version);
  +            else
               return unmarshaller.read(inputStream, null);
            }
            default:
  @@ -955,6 +960,9 @@
            case Version.VERSION_2_2:
            {
               if (trace) { log.trace(this + " writing invocation to marshaller"); }
  +            if (marshaller instanceof VersionedMarshaller)
  +               ((VersionedMarshaller) marshaller).write(invocation, outputStream, version);
  +            else
               marshaller.write(invocation, outputStream);
               if (trace) { log.trace(this + " done writing invocation to marshaller"); }