You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2020/10/18 19:24:41 UTC
[qpid-broker-j] 02/02: QPID-8477: [Broker-J] Close sender on
connection error only when state is AWAIT_OPEN
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit b8542b075f188539f60c965f1fa13684bddcb772
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Sun Oct 18 15:54:44 2020 +0100
QPID-8477: [Broker-J] Close sender on connection error only when state is AWAIT_OPEN
This closes #64
---
.../org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
index 09c46d1..8fcd9e0 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java
@@ -1164,6 +1164,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio
private void closeConnection(final Error error)
{
+ LOGGER.debug("Closing connection {} (state={}) due to {}", this, _connectionState, error);
_closeCause = error.getDescription();
Close close = new Close();
close.setError(error);
@@ -1179,6 +1180,7 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio
sendOpen(0, 0);
sendClose(close);
_connectionState = ConnectionState.CLOSED;
+ getSender().close();
break;
case OPENED:
sendClose(close);
@@ -1197,9 +1199,6 @@ public class AMQPConnection_1_0Impl extends AbstractAMQPConnection<AMQPConnectio
default:
throw new ServerScopedRuntimeException("Unknown state: " + _connectionState);
}
-
- getSender().close();
-
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org