summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Simon <arnaudsimon@apache.org>2008-03-18 12:20:49 +0000
committerArnaud Simon <arnaudsimon@apache.org>2008-03-18 12:20:49 +0000
commit92eef95df1583fb6a8d9d7df6e17101bdf6d1cfd (patch)
tree2bf89a90936e90f31749360594d208c6d75ad2cf
parentabba1b692cf1d7a7fede87bed02ef97cc1b556ad (diff)
downloadqpid-python-92eef95df1583fb6a8d9d7df6e17101bdf6d1cfd.tar.gz
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.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@638344 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java3
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java b/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
index ad47e14fde..3944e2c3f3 100644
--- a/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
+++ b/qpid/java/client/src/main/java/org/apache/qpidity/nclient/Client.java
@@ -19,6 +19,7 @@ import org.apache.qpidity.transport.ConnectionClose;
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 @@ public class Client implements org.apache.qpidity.nclient.Connection
}
// 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
{
diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java b/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
index 977704fc0c..e455be0873 100644
--- a/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
+++ b/qpid/java/common/src/main/java/org/apache/qpidity/ToyClient.java
@@ -75,7 +75,7 @@ class ToyClient extends SessionDelegate
}
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();