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 2021/02/08 17:31:14 UTC
[activemq-artemis] branch master updated: ARTEMIS-3108 bridge XML
config doesn't allow -1
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/master by this push:
new 52de382 ARTEMIS-3108 bridge XML config doesn't allow -1
new b8b4649 This closes #3440
52de382 is described below
commit 52de3827fee2979d2c9b32d8c11624f9e9406757
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Feb 8 11:16:04 2021 -0600
ARTEMIS-3108 bridge XML config doesn't allow -1
The value `-1` is valid for both the confirmation-window-size and the
producer-window-size elements.
---
.../artemis/core/deployers/impl/FileConfigurationParser.java | 4 ++--
.../src/test/resources/ConfigurationTest-full-config.xml | 9 +++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index 74d99e7..edecde9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -2057,9 +2057,9 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
String transformerClassName = getString(brNode, "transformer-class-name", null, Validators.NO_CHECK);
// Default bridge conf
- int confirmationWindowSize = getTextBytesAsIntBytes(brNode, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(), Validators.POSITIVE_INT);
+ int confirmationWindowSize = getTextBytesAsIntBytes(brNode, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(), Validators.MINUS_ONE_OR_GE_ZERO);
- int producerWindowSize = getTextBytesAsIntBytes(brNode, "producer-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeProducerWindowSize(), Validators.POSITIVE_INT);
+ int producerWindowSize = getTextBytesAsIntBytes(brNode, "producer-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeProducerWindowSize(), Validators.MINUS_ONE_OR_GE_ZERO);
long retryInterval = getLong(brNode, "retry-interval", ActiveMQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO);
diff --git a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
index 704a7c3..8d5560d 100644
--- a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -204,6 +204,15 @@
<producer-window-size>555k</producer-window-size>
<discovery-group-ref discovery-group-name="dg1"/>
</bridge>
+ <bridge name="bridge4">
+ <queue-name>queue3</queue-name>
+ <forwarding-address>bridge-forwarding-address2</forwarding-address>
+ <confirmation-window-size>-1</confirmation-window-size>
+ <producer-window-size>-1</producer-window-size>
+ <static-connectors>
+ <connector-ref>connector1</connector-ref>
+ </static-connectors>
+ </bridge>
</bridges>
<federations>
<federation name="federation1">