QPID-4900 : [Java Broker] Broker should return its version to the client as informational property in connection initiation

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

1 files changed, 12 insertions, 1 deletions

diff --git a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
index 0ef286e89e..ea3ad7606e 100644
--- a/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
+++ b/qpid/java/amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/transport/ConnectionEndpoint.java
@@ -22,6 +22,7 @@
 package org.apache.qpid.amqp_1_0.transport;
 
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import org.apache.qpid.amqp_1_0.codec.DescribedTypeConstructorRegistry;
 import org.apache.qpid.amqp_1_0.codec.ValueWriter;
@@ -119,6 +120,8 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour
     private String _remoteHostname;
     private Error _remoteError;
 
+    private Map _properties;
+
     public ConnectionEndpoint(Container container, SaslServerProvider cbs)
     {
         _container = container;
@@ -172,6 +175,11 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour
         _frameOutputHandler = frameOutputHandler;
     }
 
+    public void setProperties(Map<Symbol,Object> properties)
+    {
+        _properties = properties;
+    }
+
     public synchronized SessionEndpoint createSession(String name)
     {
         // todo assert connection state
@@ -231,7 +239,10 @@ public class ConnectionEndpoint implements DescribedTypeConstructorRegistry.Sour
         open.setContainerId(_container.getId());
         open.setMaxFrameSize(getDesiredMaxFrameSize());
         open.setHostname(getRemoteHostname());
-
+        if(_properties != null)
+        {
+            open.setProperties(_properties);
+        }
 
         send(CONNECTION_CONTROL_CHANNEL, open);
     }