summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2011-06-22 03:39:53 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2011-06-22 03:39:53 +0000
commitd3e9c13f31ece9e288e8a23df350f851c327ab17 (patch)
tree46698ecca2961bb98d02fbe8944ddb8a0b8974e8
parent4ea7bb090811a1ecfae9c1b5656bda447b90c7d4 (diff)
downloadqpid-python-d3e9c13f31ece9e288e8a23df350f851c327ab17.tar.gz
QPID-3270 The protocol version is now read from the Connection object
passed into when creating the ConnectionMetaData. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1138295 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java b/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
index 3bb5707417..5cf767ac35 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/QpidConnectionMetaData.java
@@ -30,9 +30,11 @@ import org.apache.qpid.common.QpidProperties;
public class QpidConnectionMetaData implements ConnectionMetaData
{
+ private AMQConnection con;
QpidConnectionMetaData(AMQConnection conn)
{
+ this.con = conn;
}
public int getJMSMajorVersion() throws JMSException
@@ -62,12 +64,12 @@ public class QpidConnectionMetaData implements ConnectionMetaData
public int getProviderMajorVersion() throws JMSException
{
- return 0;
+ return con.getProtocolVersion().getMajorVersion();
}
public int getProviderMinorVersion() throws JMSException
{
- return 8;
+ return con.getProtocolVersion().getMinorVersion();
}
public String getProviderVersion() throws JMSException
@@ -78,8 +80,7 @@ public class QpidConnectionMetaData implements ConnectionMetaData
private String getProtocolVersion()
{
- // TODO - Implement based on connection negotiated protocol
- return "0.8";
+ return con.getProtocolVersion().toString();
}
public String getBrokerVersion()