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

[Ron Sigal]

  User: rsigal  
  Date: 07/02/04 03:40:24

  Modified:    src/main/org/jboss/remoting/marshal/serializable   Tag:
                        remoting_2_x SerializableUnMarshaller.java
                        SerializableMarshaller.java
  Log:
  JBREM-692:  Added javadoc comments.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.10.2 +4 -2      JBossRemoting/src/main/org/jboss/remoting/marshal/serializable/SerializableUnMarshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SerializableUnMarshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/marshal/serializable/SerializableUnMarshaller.java,v
  retrieving revision 1.11.10.1
  retrieving revision 1.11.10.2
  diff -u -b -r1.11.10.1 -r1.11.10.2
  --- SerializableUnMarshaller.java	29 Jan 2007 05:13:09 -0000	1.11.10.1
  +++ SerializableUnMarshaller.java	4 Feb 2007 08:40:24 -0000	1.11.10.2
  @@ -54,6 +54,10 @@
         return getMarshallingStream(inputStream, null);
      }
      
  +   /**
  +    * SerializableUnMarshaller prefers to read from an ObjectOutputStream wrapped around a 
  +    * BufferedInputStream
  +    */
      public InputStream getMarshallingStream(InputStream inputStream, Map config) throws IOException
      {
         if (inputStream instanceof ObjectInputStream)
  @@ -89,9 +93,7 @@
      public Object read(InputStream inputStream, Map metadata) throws IOException, ClassNotFoundException
      {
         ObjectInputStream ois = (ObjectInputStream) getMarshallingStream(inputStream, null);
  -//      return ois.readObject();
         return SerializationStreamFactory.getManagerInstance(getSerializationType()).receiveObject(ois, customClassLoader);
  -      
      }
   
      /**
  
  
  
  1.11.10.3 +4 -0      JBossRemoting/src/main/org/jboss/remoting/marshal/serializable/SerializableMarshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SerializableMarshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/marshal/serializable/SerializableMarshaller.java,v
  retrieving revision 1.11.10.2
  retrieving revision 1.11.10.3
  diff -u -b -r1.11.10.2 -r1.11.10.3
  --- SerializableMarshaller.java	3 Feb 2007 20:56:47 -0000	1.11.10.2
  +++ SerializableMarshaller.java	4 Feb 2007 08:40:24 -0000	1.11.10.3
  @@ -70,6 +70,10 @@
         return getMarshallingStream(outputStream, null);
      }
      
  +   /**
  +    * SerializableMarshaller prefers to write to an ObjectOutputStream wrapped around a
  +    * BufferedOutputStream.
  +    */
      public OutputStream getMarshallingStream(OutputStream outputStream, Map config) throws IOException
      {
         if(outputStream instanceof ObjectOutputStream)