[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/marshal/http ...

[Ron Sigal]

  User: rsigal  
  Date: 07/05/09 04:30:36

  Modified:    src/main/org/jboss/remoting/marshal/http   Tag:
                        remoting_2_2_0_GA HTTPMarshaller.java
                        HTTPUnMarshaller.java
  Log:
  JBREM-714: Added version parameter to read()/write().
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.14.1  +15 -13    JBossRemoting/src/main/org/jboss/remoting/marshal/http/HTTPMarshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HTTPMarshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/marshal/http/HTTPMarshaller.java,v
  retrieving revision 1.6
  retrieving revision 1.6.14.1
  diff -u -b -r1.6 -r1.6.14.1
  --- HTTPMarshaller.java	30 Dec 2005 05:26:30 -0000	1.6
  +++ HTTPMarshaller.java	9 May 2007 08:30:36 -0000	1.6.14.1
  @@ -47,8 +47,9 @@
       * @param dataObject Object to be writen to output
       * @param output     The data output to write the object
       *                   data to.
  +    * @param version    Wire format version.
       */
  -   public void write(Object dataObject, OutputStream output) throws IOException
  +   public void write(Object dataObject, OutputStream output, int version) throws IOException
      {
         if(dataObject instanceof String)
         {
  @@ -57,18 +58,19 @@
         }
         else
         {
  -         ObjectOutputStream oos = null;
  -         if(output instanceof ObjectOutputStream)
  -         {
  -            oos = (ObjectOutputStream) output;
  -         }
  -         else
  -         {
  -            oos = SerializationStreamFactory.getManagerInstance(getSerializationType()).createOutput(output);
  -         }
  -         oos.writeObject(dataObject);
  -
  -         oos.flush();
  +//         ObjectOutputStream oos = null;
  +//         if(output instanceof ObjectOutputStream)
  +//         {
  +//            oos = (ObjectOutputStream) output;
  +//         }
  +//         else
  +//         {
  +//            oos = SerializationStreamFactory.getManagerInstance(getSerializationType()).createOutput(output);
  +//         }
  +//         oos.writeObject(dataObject);
  +//
  +//         oos.flush();
  +         super.write(dataObject, output, version);
         }
      }
   
  
  
  
  1.10.2.1.4.1 +4 -2      JBossRemoting/src/main/org/jboss/remoting/marshal/http/HTTPUnMarshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HTTPUnMarshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/marshal/http/HTTPUnMarshaller.java,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.1.4.1
  diff -u -b -r1.10.2.1 -r1.10.2.1.4.1
  --- HTTPUnMarshaller.java	7 Dec 2006 21:44:43 -0000	1.10.2.1
  +++ HTTPUnMarshaller.java	9 May 2007 08:30:36 -0000	1.10.2.1.4.1
  @@ -54,17 +54,19 @@
       * or a string.  If there is no data to read, will return null.
       *
       * @param inputStream
  +    * @param metadata
  +    * @param version
       * @return
       * @throws IOException
       * @throws ClassNotFoundException
       */
  -   public Object read(InputStream inputStream, Map metadata) throws IOException, ClassNotFoundException
  +   public Object read(InputStream inputStream, Map metadata, int version) throws IOException, ClassNotFoundException
      {
         if (isBinaryData(metadata))
         {
            try
            {
  -            return super.read(inputStream, metadata);
  +            return super.read(inputStream, metadata, version);
            }
            catch (EOFException e)
            {