svn commit: r638344 - in /incubator/qpid/trunk/qpid/java: client/src/main/java/org/apache/qpidity/nclient/Client.java common/src/main/java/org/apache/qpidity/ToyClient.java

[arnaudsimon]

Author: arnaudsimon
Date: Tue Mar 18 05:20:49 2008
New Revision: 638344

URL: http://svn.apache.org/viewvc?rev=638344&view=rev
Log:
Revision 636791 says: "Added constant to represent the AMQP versions, as 
previously it was hard-coded." Those constants must be used when the connection 
is established.

Modified:
    
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
    
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java

Modified: 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java?rev=638344&r1=638343&r2=638344&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
 Tue Mar 18 05:20:49 2008
@@ -19,6 +19,7 @@
 import org.apache.qpidity.transport.ConnectionCloseOk;
 import org.apache.qpidity.transport.ConnectionDelegate;
 import org.apache.qpidity.transport.ConnectionEvent;
+import org.apache.qpidity.transport.TransportConstants;
 import org.apache.qpidity.transport.ProtocolHeader;
 import org.apache.qpidity.transport.SessionDelegate;
 import org.apache.qpidity.transport.network.mina.MinaHandler;
@@ -141,7 +142,7 @@
         }
 
         // XXX: hardcoded version numbers
-        _conn.send(new ConnectionEvent(0, new ProtocolHeader(1, 0, 10)));
+        _conn.send(new ConnectionEvent(0, new ProtocolHeader(1, 
TransportConstants.CONNECTION_VERSION_MAJOR, 
TransportConstants.CONNECTION_VERSION_MINOR)));
 
         try
         {

Modified: 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java?rev=638344&r1=638343&r2=638344&view=diff
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
 Tue Mar 18 05:20:49 2008
@@ -75,7 +75,7 @@
                                                   }
                                                   public void closed() {}
                                               });
-        conn.send(new ConnectionEvent(0, new ProtocolHeader(1, 0, 10)));
+        conn.send(new ConnectionEvent(0, new ProtocolHeader(1, 
TransportConstants.CONNECTION_VERSION_MAJOR, 
TransportConstants.CONNECTION_VERSION_MINOR)));
 
         Channel ch = conn.getChannel(0);
         Session ssn = new Session();