[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/serialization/impl/java ...
Tom Elrod
tom.elrod at jboss.com
Mon Oct 30 23:21:06 EST 2006
User: telrod
Date: 06/10/30 23:21:06
Modified: src/main/org/jboss/remoting/serialization/impl/java Tag:
remoting_2_x JavaSerializationManager.java
Log:
JBREM-597 - updated socket invoker to use raw socket stream instead of passing marshaller/unmarshaller object stream wrapping the raw socket stream.
Revision Changes Path
No revision
No revision
1.8.4.1 +16 -16 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.8.4.1
diff -u -b -r1.8 -r1.8.4.1
--- JavaSerializationManager.java 7 Jul 2006 20:29:59 -0000 1.8
+++ JavaSerializationManager.java 31 Oct 2006 04:21:06 -0000 1.8.4.1
@@ -35,7 +35,7 @@
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.8.4.1 2006/10/31 04:21:06 telrod Exp $
*
* @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
*/
@@ -83,13 +83,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 +130,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;
}
More information about the jboss-cvs-commits
mailing list