Merging bug 21939 into default

Author: Matthew Sackman

src/com/rabbitmq/client/Connection.java

@@ -31,6 +31,7 @@
 package com.rabbitmq.client;
 
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * Public API: Interface to an AMQ connection. See the see the <a href="http://www.amqp.org/">spec</a> for details.
@@ -95,6 +96,12 @@ public interface Connection extends ShutdownNotifier { // rename to AMQPConnecti
      */
     Address[] getKnownHosts();
 
+    /**
+     * Retrieve the server properties.
+     * @return a map of the server properties. This typically includes the product name and version of the server.
+     */
+    Map<String, Object> getServerProperties();
+
     /**
      * Create a new channel, using an internally allocated channel number.
      * @return a new channel descriptor, or null if none is available

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -147,6 +147,9 @@ public void ensureIsOpen()
     private final String _username, _password, _virtualHost;
     private final int _requestedChannelMax, _requestedFrameMax, _requestedHeartbeat;
 
+    /** Saved server properties field from connection.start */
+    public Map<String, Object> _serverProperties;
+
     /** {@inheritDoc} */
     public String getHost() {
         return _frameHandler.getHost();
@@ -166,6 +169,11 @@ public FrameHandler getFrameHandler(){
         return _frameHandler;
     }
 
+    /** {@inheritDoc} */
+    public Map<String, Object> getServerProperties() {
+        return _serverProperties;
+    }
+
     /**
      * Construct a new connection to a broker.
      * @param factory the initialization parameters for a connection
@@ -243,6 +251,8 @@ public void start(boolean insist)
         try {
             AMQP.Connection.Start connStart =
                 (AMQP.Connection.Start) connStartBlocker.getReply().getMethod();
+
+            _serverProperties = connStart.getServerProperties();
 
             Version serverVersion =
                 new Version(connStart.getVersionMajor(),