You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2024/08/15 13:13:52 UTC
(activemq-artemis) branch main updated: ARTEMIS-4986: fixups for prior PR feedback
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic 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 3f5184a933 ARTEMIS-4986: fixups for prior PR feedback
3f5184a933 is described below
commit 3f5184a933c9eb775c06103d8c7ad0b576673112
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Aug 15 13:53:04 2024 +0100
ARTEMIS-4986: fixups for prior PR feedback
---
.../java/org/apache/activemq/artemis/core/protocol/core/Channel.java | 4 ++--
.../apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java | 2 +-
.../apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
index d8785952c5..add18c5587 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/Channel.java
@@ -58,8 +58,8 @@ public interface Channel {
boolean supports(byte packetID, int version);
/*
- * Due to ARTEMIS-4986, older versions (2.30.0 in particular) will require a special voting handling,
- * where we would perform specific retries at older values.
+ * Due to ARTEMIS-4986, older versions (<= 2.31.2 in particular) before 2.37.0 will require
+ * special voting handling, where we would perform specific retries with older values.
*/
default boolean requireSpecialVotingHandling() {
return false;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
index e33d603ffa..12b3fa1c01 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ChannelImpl.java
@@ -202,7 +202,7 @@ public final class ChannelImpl implements Channel {
@Override
public boolean requireSpecialVotingHandling() {
- return connection.getChannelVersion() < PacketImpl.ARTEMIS_2_36_0_VERSION;
+ return connection.getChannelVersion() < PacketImpl.ARTEMIS_2_37_0_VERSION;
}
@Override
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
index 137898b4c7..76717a04ef 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
@@ -53,7 +53,8 @@ public class PacketImpl implements Packet {
// 2.29.0
public static final int ARTEMIS_2_29_0_VERSION = 135;
- public static final int ARTEMIS_2_36_0_VERSION = 136;
+ // 2.37.0
+ public static final int ARTEMIS_2_37_0_VERSION = 136;
public static final SimpleString OLD_QUEUE_PREFIX = SimpleString.of("jms.queue.");
public static final SimpleString OLD_TEMP_QUEUE_PREFIX = SimpleString.of("jms.tempqueue.");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@activemq.apache.org
For additional commands, e-mail: commits-help@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact