QPID-6401 : Merge of 1661079 to 0.32

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

1 files changed, 8 insertions, 7 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 92b6db9823..0847a49e07 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
@@ -1564,10 +1564,10 @@ public class AMQProtocolEngine implements ServerProtocolEngine,
             else
             {
                 setVirtualHost(virtualHost);
-
-                if(virtualHost.authoriseCreateConnection(this))
+                try
                 {
-                    try
+
+                    if(virtualHost.authoriseCreateConnection(this))
                     {
                         if (getContextKey() == null)
                         {
@@ -1579,15 +1579,16 @@ public class AMQProtocolEngine implements ServerProtocolEngine,
 
                         writeFrame(responseBody.generateFrame(0));
                         _state = ConnectionState.OPEN;
+
                     }
-                    catch (AccessControlException e)
+                    else
                     {
-                        closeConnection(AMQConstant.ACCESS_REFUSED, e.getMessage(), 0);
+                        closeConnection(AMQConstant.ACCESS_REFUSED, "Connection refused",0);
                     }
                 }
-                else
+                catch (AccessControlException e)
                 {
-                    closeConnection(AMQConstant.ACCESS_REFUSED, "Connection refused",0);
+                    closeConnection(AMQConstant.ACCESS_REFUSED, e.getMessage(), 0);
                 }
             }
         }