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
commit e7dbe8d68eafed61da888ed0ea3d0c01f1c7468f Author: Clebert Suconic <[email protected]> AuthorDate: Mon Feb 10 17:08:46 2025 -0500 ARTEMIS-5303 -1 should mean NULL on AddressSettings --- .../activemq/artemis/core/settings/impl/AddressSettings.java | 6 +++++- .../apache/activemq/artemis/core/settings/AddressSettingsTest.java | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java index 3ca2924033..5c1fab3096 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/AddressSettings.java @@ -834,7 +834,7 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable } public AddressSettings setPageSizeBytes(final int pageSize) { - pageSizeBytes = pageSize; + this.pageSizeBytes = testForNull(pageSize); return this; } @@ -855,6 +855,10 @@ public class AddressSettings implements Mergeable<AddressSettings>, Serializable return maxSizeMessages != null ? maxSizeMessages : AddressSettings.DEFAULT_MAX_SIZE_MESSAGES; } + private Integer testForNull(int value) { + return value < 0 ? null : value; + } + public AddressSettings setMaxSizeMessages(final long maxSizeMessages) { this.maxSizeMessages = maxSizeMessages; return this; diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java index 3ec0c359b3..21fdfd2c0c 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/settings/AddressSettingsTest.java @@ -64,6 +64,13 @@ public class AddressSettingsTest extends ServerTestBase { assertEquals(AddressSettings.DEFAULT_NO_EXPIRY, addressSettings.isNoExpiry()); } + @Test + public void testSizeNegative() { + AddressSettings addressSettings = new AddressSettings(); + addressSettings.setPageSizeBytes(-1); + assertEquals(AddressSettings.DEFAULT_PAGE_SIZE, addressSettings.getPageSizeBytes()); + } + @Test public void testSingleMerge() { testSingleMerge(false); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
