This is an automated email from the ASF dual-hosted git repository.
tabish pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 36b966de32 ARTEMIS-5605 Use correct reference to proton receiver in
initialize
36b966de32 is described below
commit 36b966de3250128dc045ae39baa10474f17c8dec
Author: Timothy Bish <[email protected]>
AuthorDate: Thu Jul 31 17:14:26 2025 -0400
ARTEMIS-5605 Use correct reference to proton receiver in initialize
When initializing bridge and federation receiver links use the correct
reference to the proton Receiver when validating capabilities to ensure
it cannot be null if the bridge or federation receiver link is closed
before the remote attach arrives.
---
.../protocol/amqp/connect/bridge/AMQPBridgeFromAddressReceiver.java | 2 +-
.../protocol/amqp/connect/bridge/AMQPBridgeFromQueueReceiver.java | 2 +-
.../protocol/amqp/connect/federation/AMQPFederationAddressConsumer.java | 2 +-
.../protocol/amqp/connect/federation/AMQPFederationQueueConsumer.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeFromAddressReceiver.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeFromAddressReceiver.java
index a066c37046..de12f2a4bb 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeFromAddressReceiver.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeFromAddressReceiver.java
@@ -332,7 +332,7 @@ public class AMQPBridgeFromAddressReceiver extends
AMQPBridgeReceiver {
}
// If we offered core tunneling then check if the remote indicated
support and enabled the readers
- if (configuration.isCoreMessageTunnelingEnabled() &&
verifyDesiredCapability(protonReceiver, CORE_MESSAGE_TUNNELING_SUPPORT)) {
+ if (configuration.isCoreMessageTunnelingEnabled() &&
verifyDesiredCapability(receiver, CORE_MESSAGE_TUNNELING_SUPPORT)) {
enableCoreTunneling();
}
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeFromQueueReceiver.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeFromQueueReceiver.java
index 2a387e02d7..85eab69100 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeFromQueueReceiver.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeFromQueueReceiver.java
@@ -301,7 +301,7 @@ public class AMQPBridgeFromQueueReceiver extends
AMQPBridgeReceiver {
}
// If we offered core tunneling then check if the remote indicated
support and enabled the readers
- if (configuration.isCoreMessageTunnelingEnabled() &&
verifyDesiredCapability(protonReceiver, CORE_MESSAGE_TUNNELING_SUPPORT)) {
+ if (configuration.isCoreMessageTunnelingEnabled() &&
verifyDesiredCapability(receiver, CORE_MESSAGE_TUNNELING_SUPPORT)) {
enableCoreTunneling();
}
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationAddressConsumer.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationAddressConsumer.java
index a95d3f3abe..943153df0d 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationAddressConsumer.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationAddressConsumer.java
@@ -376,7 +376,7 @@ public final class AMQPFederationAddressConsumer extends
AMQPFederationConsumer
if (configuration.isCoreMessageTunnelingEnabled()) {
// We will have offered it if the option is enabled, but the
remote needs to indicate it desires it
// otherwise we want to fail on any tunneled core messages that
arrives which is the default.
- if (verifyDesiredCapability(protonReceiver,
AmqpSupport.CORE_MESSAGE_TUNNELING_SUPPORT)) {
+ if (verifyDesiredCapability(receiver,
AmqpSupport.CORE_MESSAGE_TUNNELING_SUPPORT)) {
enableCoreTunneling();
}
}
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationQueueConsumer.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationQueueConsumer.java
index fc59cee851..dbf9d55def 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationQueueConsumer.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/federation/AMQPFederationQueueConsumer.java
@@ -315,7 +315,7 @@ public final class AMQPFederationQueueConsumer extends
AMQPFederationConsumer {
if (configuration.isCoreMessageTunnelingEnabled()) {
// We will have offered it if the option is enabled, but the
remote needs to indicate it desires it
// otherwise we want to fail on any tunneled core messages that
arrives which is the default.
- if (verifyDesiredCapability(protonReceiver,
AmqpSupport.CORE_MESSAGE_TUNNELING_SUPPORT)) {
+ if (verifyDesiredCapability(receiver,
AmqpSupport.CORE_MESSAGE_TUNNELING_SUPPORT)) {
enableCoreTunneling();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
