[jboss-cvs] JBossAS SVN: r62971 - branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 10 14:20:45 EDT 2007
Author: ron_sigal
Date: 2007-05-10 14:20:44 -0400 (Thu, 10 May 2007)
New Revision: 62971
Modified:
branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java
branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java
branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java
branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java
Log:
JBPAPP-168: JBossAS marshallers/unmarshallers implement versioned read() and write() methods.
Modified: branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java 2007-05-10 16:35:30 UTC (rev 62970)
+++ branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java 2007-05-10 18:20:44 UTC (rev 62971)
@@ -63,7 +63,7 @@
* @param output The data output to write the object
* data to.
*/
- public void write(Object dataObject, OutputStream output) throws IOException
+ public void write(Object dataObject, OutputStream output, int version) throws IOException
{
if(dataObject instanceof InvocationRequest)
{
@@ -103,7 +103,7 @@
}
- super.write(dataObject, output);
+ super.write(dataObject, output, version);
}
else // assume this is going to be the response
Modified: branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java 2007-05-10 16:35:30 UTC (rev 62970)
+++ branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java 2007-05-10 18:20:44 UTC (rev 62971)
@@ -46,9 +46,9 @@
public final static String DATATYPE = "invocationhttp";
- public Object read(InputStream inputStream, Map metadata) throws IOException, ClassNotFoundException
+ public Object read(InputStream inputStream, Map metadata, int version) throws IOException, ClassNotFoundException
{
- Object ret = super.read(inputStream, metadata);
+ Object ret = super.read(inputStream, metadata, version);
if(ret instanceof InvocationRequest)
{
Modified: branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java 2007-05-10 16:35:30 UTC (rev 62970)
+++ branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java 2007-05-10 18:20:44 UTC (rev 62971)
@@ -68,7 +68,13 @@
super.write(addDecoration(dataObject), output);
}
+
+ public void write(Object dataObject, OutputStream output, int version) throws IOException
+ {
+ super.write(addDecoration(dataObject), output, version);
+ }
+
public Object addDecoration(Object dataObject) throws IOException {
if(dataObject instanceof InvocationRequest)
{
Modified: branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java 2007-05-10 16:35:30 UTC (rev 62970)
+++ branches/Branch_4_2/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java 2007-05-10 18:20:44 UTC (rev 62971)
@@ -53,7 +53,15 @@
return removeDecoration(ret);
}
+
+ public Object read(InputStream inputStream, Map metadata, int version) throws IOException, ClassNotFoundException
+ {
+ Object ret = super.read(inputStream, metadata, version);
+
+ return removeDecoration(ret);
+ }
+
public UnMarshaller cloneUnMarshaller() throws CloneNotSupportedException
{
InvocationUnMarshaller unmarshaller = new InvocationUnMarshaller();
More information about the jboss-cvs-commits
mailing list