[jboss-cvs] JBossAS SVN: r63488 - trunk/server/src/main/org/jboss/invocation/unified/marshall.

[jboss-cvs-commits at lists.jboss.org]

Author: ron_sigal
Date: 2007-06-12 20:48:24 -0400 (Tue, 12 Jun 2007)
New Revision: 63488

Modified:
   trunk/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java
   trunk/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java
   trunk/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java
   trunk/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java
Log:
JBPAPP-168:  JBossAS marshallers/unmarshallers implement versioned read() and write() methods.

Modified: trunk/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java
===================================================================
--- trunk/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java	2007-06-12 22:05:47 UTC (rev 63487)
+++ trunk/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationMarshaller.java	2007-06-13 00:48:24 UTC (rev 63488)
@@ -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: trunk/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java
===================================================================
--- trunk/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java	2007-06-12 22:05:47 UTC (rev 63487)
+++ trunk/server/src/main/org/jboss/invocation/unified/marshall/HTTPInvocationUnMarshaller.java	2007-06-13 00:48:24 UTC (rev 63488)
@@ -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: trunk/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java
===================================================================
--- trunk/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java	2007-06-12 22:05:47 UTC (rev 63487)
+++ trunk/server/src/main/org/jboss/invocation/unified/marshall/InvocationMarshaller.java	2007-06-13 00:48:24 UTC (rev 63488)
@@ -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: trunk/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java
===================================================================
--- trunk/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java	2007-06-12 22:05:47 UTC (rev 63487)
+++ trunk/server/src/main/org/jboss/invocation/unified/marshall/InvocationUnMarshaller.java	2007-06-13 00:48:24 UTC (rev 63488)
@@ -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();