Author: orudyy
Date: Tue May 10 12:03:54 2016
New Revision: 1743161
URL: http://svn.apache.org/viewvc?rev=1743161&view=rev
Log:
QPID-7257: [Java Broker] Correct connection state logging
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1743161&r1=1743160&r2=1743161&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
Tue May 10 12:03:54 2016
@@ -51,6 +51,7 @@ import org.apache.qpid.server.security.S
import
org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.SubjectAuthenticationResult;
import org.apache.qpid.server.transport.AMQPConnection;
+import org.apache.qpid.server.util.ConnectionScopedRuntimeException;
import org.apache.qpid.server.virtualhost.VirtualHostUnavailableException;
import org.apache.qpid.transport.*;
import org.apache.qpid.transport.network.NetworkConnection;
@@ -112,8 +113,10 @@ public class ServerConnectionDelegate ex
{
if(_state != requiredState)
{
- conn.sendConnectionClose(ConnectionCloseCode.FRAMING_ERROR,
"Command Invalid expected "+requiredState+" but was "+_state);
+ String replyText = "Command Invalid, expected " + requiredState +
" but was " + _state;
+ conn.sendConnectionClose(ConnectionCloseCode.FRAMING_ERROR,
replyText);
conn.closeAndIgnoreFutureInput();
+ throw new ConnectionScopedRuntimeException(replyText);
}
}
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1743161&r1=1743160&r2=1743161&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
Tue May 10 12:03:54 2016
@@ -918,8 +918,9 @@ public class AMQPConnection_0_8
{
if(_state != requiredState)
{
- sendConnectionClose(AMQConstant.COMMAND_INVALID, "Command
Invalid", 0);
-
+ String replyText = "Command Invalid, expected " + requiredState +
" but was " + _state;
+ sendConnectionClose(AMQConstant.COMMAND_INVALID, replyText, 0);
+ throw new ConnectionScopedRuntimeException(replyText);
}
}
@@ -933,6 +934,8 @@ public class AMQPConnection_0_8
_logger.debug("RECV ConnectionOpen[" +" virtualHost: " +
virtualHostName + " capabilities: " + capabilities + " insist: " + insist + "
]");
}
+ assertState(ConnectionState.AWAIT_OPEN);
+
String virtualHostStr = AMQShortString.toString(virtualHostName);
if ((virtualHostStr != null) && virtualHostStr.charAt(0) == '/')
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
