[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/marshal/serializable ...
Ron Sigal
ron_sigal at yahoo.com
Sun Feb 4 03:48:39 EST 2007
User: rsigal
Date: 07/02/04 03:48:39
Modified: src/main/org/jboss/remoting/marshal/serializable
SerializableMarshaller.java
SerializableUnMarshaller.java
Log:
JBREM-692: Added javadoc comment.
Revision Changes Path
1.13 +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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SerializableMarshaller.java 3 Feb 2007 05:23:52 -0000 1.12
+++ SerializableMarshaller.java 4 Feb 2007 08:48:39 -0000 1.13
@@ -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)
1.13 +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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SerializableUnMarshaller.java 3 Feb 2007 05:24:06 -0000 1.12
+++ SerializableUnMarshaller.java 4 Feb 2007 08:48:39 -0000 1.13
@@ -53,6 +53,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)
@@ -88,9 +92,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);
-
}
/**
More information about the jboss-cvs-commits
mailing list