[jboss-remoting-commits] JBoss Remoting SVN: r3570 - remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet.

Author: ron.sigal(a)jboss.com Date: 2008-03-06 03:12:47 -0500 (Thu, 06 Mar 2008) New Revision: 3570 Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java Log: JBREM-764: Replaced call to Version.getDefaultVersion() with call to AbstractInvoker.getVersion(). Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java =================================================================== --- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java 2008-03-06 08:12:28 UTC (rev 3569) +++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/servlet/ServletServerInvoker.java 2008-03-06 08:12:47 UTC (rev 3570) @@ -121,7 +121,7 @@ UnMarshaller unmarshaller = MarshalFactory.getUnMarshaller(HTTPUnMarshaller.DATATYPE, getSerializationType()); Object obj = null; if (unmarshaller instanceof VersionedUnMarshaller) - obj = ((VersionedUnMarshaller)unmarshaller).read(inputStream, metadata, Version.getDefaultVersion()); + obj = ((VersionedUnMarshaller)unmarshaller).read(inputStream, metadata, getVersion()); else obj = unmarshaller.read(inputStream, metadata); inputStream.close(); @@ -176,7 +176,7 @@ ServletOutputStream outputStream = response.getOutputStream(); Marshaller marshaller = MarshalFactory.getMarshaller(HTTPMarshaller.DATATYPE, getSerializationType()); if (marshaller instanceof VersionedMarshaller) - ((VersionedMarshaller) marshaller).write(invocationResponse, outputStream, Version.getDefaultVersion()); + ((VersionedMarshaller) marshaller).write(invocationResponse, outputStream, getVersion()); else marshaller.write(invocationResponse, outputStream); outputStream.close(); @@ -252,7 +252,7 @@ UnMarshaller unmarshaller = getUnMarshaller(); Object obj = null; if (unmarshaller instanceof VersionedUnMarshaller) - obj = ((VersionedUnMarshaller)unmarshaller).read(new ByteArrayInputStream(requestByte), metadata, Version.getDefaultVersion()); + obj = ((VersionedUnMarshaller)unmarshaller).read(new ByteArrayInputStream(requestByte), metadata, getVersion()); else obj = unmarshaller.read(new ByteArrayInputStream(requestByte), metadata); inputStream.close(); @@ -383,7 +383,7 @@ ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); Marshaller marshaller = getMarshaller(); if (marshaller instanceof VersionedMarshaller) - ((VersionedMarshaller) marshaller).write(responseObject, outputStream, Version.getDefaultVersion()); + ((VersionedMarshaller) marshaller).write(responseObject, outputStream, getVersion()); else marshaller.write(responseObject, outputStream); retval = outputStream.toByteArray();