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

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

Author: ron.sigal at jboss.com
Date: 2008-03-06 03:07:56 -0500 (Thu, 06 Mar 2008)
New Revision: 3565

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

Modified: remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java
===================================================================
--- remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java	2008-03-06 06:03:26 UTC (rev 3564)
+++ remoting2/branches/2.x/src/main/org/jboss/remoting/transport/http/HTTPClientInvoker.java	2008-03-06 08:07:56 UTC (rev 3565)
@@ -268,7 +268,7 @@
          }
 
          // set the remoting version
-         conn.setRequestProperty(HTTPMetadataConstants.REMOTING_VERSION_HEADER, new Integer(Version.getDefaultVersion()).toString());
+         conn.setRequestProperty(HTTPMetadataConstants.REMOTING_VERSION_HEADER, new Integer(getVersion()).toString());
          // set the user agent
          conn.setRequestProperty(HTTPMetadataConstants.REMOTING_USER_AGENT, "JBossRemoting - " + Version.VERSION);
 
@@ -281,7 +281,7 @@
 
             OutputStream stream = conn.getOutputStream();
             if (marshaller instanceof VersionedMarshaller)
-               ((VersionedMarshaller) marshaller).write(invocation, stream, Version.getDefaultVersion());
+               ((VersionedMarshaller) marshaller).write(invocation, stream, getVersion());
             else
                marshaller.write(invocation, stream);
             responseCode = conn.getResponseCode();
@@ -419,7 +419,7 @@
                conn.setDoInput(true);
                conn.setRequestMethod("HEAD");
                // set the remoting version
-               conn.setRequestProperty(HTTPMetadataConstants.REMOTING_VERSION_HEADER, new Integer(Version.getDefaultVersion()).toString());
+               conn.setRequestProperty(HTTPMetadataConstants.REMOTING_VERSION_HEADER, new Integer(getVersion()).toString());
                // set the user agent
                conn.setRequestProperty(HTTPMetadataConstants.REMOTING_USER_AGENT, "JBossRemoting - " + Version.VERSION);
                conn.setRequestProperty(HTTPMetadataConstants.REMOTING_LEASE_QUERY, "true");
@@ -489,7 +489,7 @@
       }
       
       if (unmarshaller instanceof VersionedUnMarshaller)
-         result = ((VersionedUnMarshaller)unmarshaller).read(is, map, Version.getDefaultVersion());
+         result = ((VersionedUnMarshaller)unmarshaller).read(is, map, getVersion());
       else
          result = unmarshaller.read(is, map);