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:43:22 UTC
[qpid-broker-j] branch 7.1.x updated (fab70b0 -> 168ba32)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from fab70b0 QPID-8473:[Broker-J]Added operational logs for sender links
new 2428dfb Added close sender when closing AMQP connection
new 168ba32 QPID-8477: [Broker-J] Close sender on connection error only when state is AWAIT_OPEN
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java | 2 ++
1 file changed, 2 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8477: [Broker-J] Close sender on
connection error only when state is AWAIT_OPEN
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 168ba32123c63d26f68dca5c7da9205d6be2eff0
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
(cherry picked from commit b8542b075f188539f60c965f1fa13684bddcb772)
---
.../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
[qpid-broker-j] 01/02: Added close sender when closing AMQP
connection
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 2428dfbe6ef7e7e87f33bc1426dcbb9f821a82ac
Author: aw924 <da...@deutsche-boerse.com>
AuthorDate: Mon Oct 12 12:32:29 2020 +0200
Added close sender when closing AMQP connection
(cherry picked from commit f4c8ee1b88255cb109826d6e02d0f32ff645c266)
---
.../org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0Impl.java | 3 +++
1 file changed, 3 insertions(+)
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 0814382..09c46d1 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
@@ -1197,6 +1197,9 @@ 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