From 401a3e1ff9509d85f0b9774018ac96c45aa850f7 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 20 Feb 2015 09:24:10 +0000 Subject: QPID-6401 : move authroize check inside try-catch git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1661079 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/protocol/v0_8/AMQProtocolEngine.java | 15 ++++++++------- 1 file 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); } } } -- cgit v1.2.1