[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/coyote ...

[Ron Sigal]

  User: rsigal  
  Date: 07/05/09 04:36:17

  Modified:    src/main/org/jboss/remoting/transport/coyote  Tag:
                        remoting_2_2_0_GA CoyoteInvoker.java
  Log:
  JBREM-714: Added special handling for VersionedMarshaller.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.23.2.3.2.1 +11 -2     JBossRemoting/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CoyoteInvoker.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java,v
  retrieving revision 1.23.2.3
  retrieving revision 1.23.2.3.2.1
  diff -u -b -r1.23.2.3 -r1.23.2.3.2.1
  --- CoyoteInvoker.java	20 Mar 2007 03:18:43 -0000	1.23.2.3
  +++ CoyoteInvoker.java	9 May 2007 08:36:17 -0000	1.23.2.3.2.1
  @@ -32,6 +32,8 @@
   import org.jboss.remoting.Version;
   import org.jboss.remoting.marshal.Marshaller;
   import org.jboss.remoting.marshal.UnMarshaller;
  +import org.jboss.remoting.marshal.VersionedMarshaller;
  +import org.jboss.remoting.marshal.VersionedUnMarshaller;
   import org.jboss.remoting.security.SSLSocketBuilder;
   import org.jboss.remoting.transport.coyote.ssl.RemotingSSLImplementation;
   import org.jboss.remoting.transport.coyote.ssl.RemotingServerSocketFactory;
  @@ -423,6 +425,9 @@
               String responseContentType = responseObject == null ? req.getContentType() : WebUtil.getContentType(responseObject);
               res.setContentType(responseContentType);
               Marshaller marshaller = getMarshaller();
  +            if (marshaller instanceof VersionedMarshaller)
  +            ((VersionedMarshaller) marshaller).write(responseObject, response.getOutputStream(), version);
  +            else
               marshaller.write(responseObject, response.getOutputStream());
               return;
            }
  @@ -454,7 +459,11 @@
               {
                  // must be POST or PUT
                  UnMarshaller unmarshaller = getUnMarshaller();
  -               Object obj = unmarshaller.read(request.getInputStream(), request);
  +               Object obj = null;
  +               if (unmarshaller instanceof VersionedUnMarshaller)
  +                  obj = ((VersionedUnMarshaller)unmarshaller).read(request.getInputStream(), request, version);
  +               else
  +                  obj = unmarshaller.read(request.getInputStream(), request);
                  if (obj instanceof InvocationRequest)
                  {
                     receivedInvocationRequest.set(TRUE);