QPID-6424 : Implement Connection.Redirect in 0-8/9/9-1

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

1 files changed, 12 insertions, 4 deletions

diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
index 0847a49e07..cb145aac88 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
+++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java
@@ -1544,7 +1544,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine,
             virtualHostStr = virtualHostName == null ? null : virtualHostName.toString();
         }
 
-        VirtualHostImpl virtualHost = ((AmqpPort)getPort()).getVirtualHost(virtualHostStr);
+        VirtualHostImpl<?,?,?> virtualHost = ((AmqpPort)getPort()).getVirtualHost(virtualHostStr);
 
         if (virtualHost == null)
         {
@@ -1557,8 +1557,16 @@ public class AMQProtocolEngine implements ServerProtocolEngine,
             // Check virtualhost access
             if (virtualHost.getState() != State.ACTIVE)
             {
-                closeConnection(AMQConstant.CONNECTION_FORCED,
-                                "Virtual host '" + virtualHost.getName() + "' is not active",0);
+                String redirectHost = virtualHost.getRedirectHost(getPort());
+                if(redirectHost != null)
+                {
+                    closeConnection(0, new AMQFrame(0,new ConnectionRedirectBody(getProtocolVersion(),AMQShortString.valueOf(redirectHost), null)));
+                }
+                else
+                {
+                    closeConnection(AMQConstant.CONNECTION_FORCED,
+                                    "Virtual host '" + virtualHost.getName() + "' is not active", 0);
+                }
 
             }
             else
@@ -1754,7 +1762,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine,
         _logger.info("Locale selected: " + locale);
 
         SubjectCreator subjectCreator = getSubjectCreator();
-        SaslServer ss = null;
+        SaslServer ss;
         try
         {
             ss = subjectCreator.createSaslServer(String.valueOf(mechanism),