QPID-3079: resync to trunkqpid-3079

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3079@1138503 13f79535-47bb-0310-9956-ffa450edef68

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()