[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java ...

[Tom Elrod]

  User: telrod  
  Date: 06/10/30 23:37:52

  Modified:    src/main/org/jboss/remoting/serialization/impl/java 
                        JavaSerializationManager.java
  Log:
  JBREM-597 - changed to raw socket stream passed to marshaller and unmarshaller instead of being wrapped in object stream beforehand.
  
  Revision  Changes    Path
  1.9       +22 -21    JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java/JavaSerializationManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JavaSerializationManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java/JavaSerializationManager.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- JavaSerializationManager.java	7 Jul 2006 20:29:59 -0000	1.8
  +++ JavaSerializationManager.java	31 Oct 2006 04:37:52 -0000	1.9
  @@ -23,19 +23,20 @@
   
   package org.jboss.remoting.serialization.impl.java;
   
  +import org.jboss.logging.Logger;
  +import org.jboss.remoting.loading.ObjectInputStreamWithClassLoader;
  +import org.jboss.remoting.serialization.IMarshalledValue;
  +import org.jboss.remoting.serialization.SerializationManager;
  +import org.jboss.remoting.serialization.SerializationStreamFactory;
  +
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.ObjectInputStream;
   import java.io.ObjectOutputStream;
   import java.io.OutputStream;
  -import org.jboss.logging.Logger;
  -import org.jboss.remoting.loading.ObjectInputStreamWithClassLoader;
  -import org.jboss.remoting.serialization.SerializationManager;
  -import org.jboss.remoting.serialization.SerializationStreamFactory;
  -import org.jboss.remoting.serialization.IMarshalledValue;
   
   /**
  - * $Id: JavaSerializationManager.java,v 1.8 2006/07/07 20:29:59 csuconic Exp $
  + * $Id: JavaSerializationManager.java,v 1.9 2006/10/31 04:37:52 telrod Exp $
    *
    * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
    */
  @@ -83,13 +84,13 @@
      public void sendObject(ObjectOutputStream oos, Object dataObject) throws IOException
      {
         oos.writeObject(dataObject);
  -      oos.reset();
  +//      oos.reset();
         // to make sure stream gets reset
         // Stupid ObjectInputStream holds object graph
         // can only be set by the client/server sending a TC_RESET
  -      oos.writeObject(Boolean.TRUE);
  +//      oos.writeObject(Boolean.TRUE);
         oos.flush();
  -      oos.reset();
  +//      oos.reset();
      }
   
      public Object receiveObject(InputStream inputStream, ClassLoader customClassLoader) throws IOException, ClassNotFoundException
  @@ -130,17 +131,17 @@
   
   
         obj = objInputStream.readObject();
  -      try
  -      {
  -         objInputStream.readObject(); // for stupid ObjectInputStream reset
  -      }
  -      catch(Exception e)
  -      {
  -         /**
  -          * Putting try catch around this because if using servlet sever invoker, the previous
  -          * call is not needed, so will throw EOFException and can ignore.
  -          */
  -      }
  +//      try
  +//      {
  +//         objInputStream.readObject(); // for stupid ObjectInputStream reset
  +//      }
  +//      catch(Exception e)
  +//      {
  +//         /**
  +//          * Putting try catch around this because if using servlet sever invoker, the previous
  +//          * call is not needed, so will throw EOFException and can ignore.
  +//          */
  +//      }
         return obj;
      }