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

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

Author: ron.sigal at jboss.com
Date: 2008-03-06 03:14:05 -0500 (Thu, 06 Mar 2008)
New Revision: 3572

Modified:
   remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java
Log:
JBREM-764: Replaced calls to Version.getDefaultVersion() with calls to AbstractInvoker.getVersion().

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java	2008-03-06 08:13:25 UTC (rev 3571)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/socket/ServerThread.java	2008-03-06 08:14:05 UTC (rev 3572)
@@ -162,7 +162,7 @@
          {
             shouldCheckConnection = Boolean.valueOf(checkValue).booleanValue();
          }
-         else if (Version.getDefaultVersion() == Version.VERSION_1)
+         else if (invoker.getVersion() == Version.VERSION_1)
          {
             shouldCheckConnection = true;
          }
@@ -601,9 +601,8 @@
 
       // Ok, now read invocation and invoke
       
-      //TODO: -TME This needs to be done by ServerInvoker
-      int version = Version.getDefaultVersion();
-      boolean performVersioning = Version.performVersioning();
+      int version = invoker.getVersion();
+      boolean performVersioning = Version.performVersioning(version);
       InputStream inputStream = socketWrapper.getInputStream();
 
       if (performVersioning)