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 6fd2d62d89 ARTEMIS-5762 remove unused AddressSetting field 
dropMessagesWhenFull
6fd2d62d89 is described below

commit 6fd2d62d8946e6e9131ce908d84372f98e884c5f
Author: Justin Bertram <[email protected]>
AuthorDate: Fri Nov 14 11:33:18 2025 -0600

    ARTEMIS-5762 remove unused AddressSetting field dropMessagesWhenFull
---
 .../artemis/core/settings/impl/AddressSettings.java       | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

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 36d2295998..97e854665e 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
@@ -208,11 +208,6 @@ public class AddressSettings implements 
Mergeable<AddressSettings>, Serializable
    }
    private Integer pageCacheMaxSize = null;
 
-   static {
-      metaBean.add(Boolean.class, "dropMessagesWhenFull", (t, p) -> 
t.dropMessagesWhenFull = p, t -> t.dropMessagesWhenFull);
-   }
-   private Boolean dropMessagesWhenFull = null;
-
    static {
       metaBean.add(Integer.class, "maxDeliveryAttempts", (t, p) -> 
t.maxDeliveryAttempts = p, t -> t.maxDeliveryAttempts);
    }
@@ -1345,7 +1340,8 @@ public class AddressSettings implements 
Mergeable<AddressSettings>, Serializable
 
       pageCacheMaxSize = BufferHelper.readNullableInteger(buffer);
 
-      dropMessagesWhenFull = BufferHelper.readNullableBoolean(buffer);
+      // this remains for backwards compatibility with older versions that 
encoded the "dropMessagesWhenFull" field
+      BufferHelper.readNullableBoolean(buffer);
 
       maxDeliveryAttempts = BufferHelper.readNullableInteger(buffer);
 
@@ -1642,7 +1638,6 @@ public class AddressSettings implements 
Mergeable<AddressSettings>, Serializable
              Objects.equals(maxSizeMessages, other.maxSizeMessages) &&
              Objects.equals(pageSizeBytes, other.pageSizeBytes) &&
              Objects.equals(pageCacheMaxSize, other.pageCacheMaxSize) &&
-             Objects.equals(dropMessagesWhenFull, other.dropMessagesWhenFull) 
&&
              Objects.equals(maxDeliveryAttempts, other.maxDeliveryAttempts) &&
              Objects.equals(messageCounterHistoryDayLimit, 
other.messageCounterHistoryDayLimit) &&
              Objects.equals(redeliveryDelay, other.redeliveryDelay) &&
@@ -1715,8 +1710,8 @@ public class AddressSettings implements 
Mergeable<AddressSettings>, Serializable
    public int hashCode() {
       return Objects.hash(addressFullMessagePolicy, maxSizeBytes, 
maxReadPageBytes, maxReadPageMessages,
                           prefetchPageBytes, prefetchPageMessages, 
pageLimitBytes, pageLimitMessages,
-                          pageFullMessagePolicy, maxSizeMessages, 
pageSizeBytes, pageCacheMaxSize, dropMessagesWhenFull,
-                          maxDeliveryAttempts, messageCounterHistoryDayLimit, 
redeliveryDelay, redeliveryMultiplier,
+                          pageFullMessagePolicy, maxSizeMessages, 
pageSizeBytes, pageCacheMaxSize, maxDeliveryAttempts,
+                          messageCounterHistoryDayLimit, redeliveryDelay, 
redeliveryMultiplier,
                           redeliveryCollisionAvoidanceFactor, 
maxRedeliveryDelay, deadLetterAddress, expiryAddress,
                           expiryDelay, minExpiryDelay, maxExpiryDelay, 
noExpiry, defaultLastValueQueue,
                           defaultLastValueKey, defaultNonDestructive, 
defaultExclusiveQueue, defaultGroupRebalance,
@@ -1739,7 +1734,7 @@ public class AddressSettings implements 
Mergeable<AddressSettings>, Serializable
 
    @Override
    public String toString() {
-      return "AddressSettings{" + "addressFullMessagePolicy=" + 
addressFullMessagePolicy + ", maxSizeBytes=" + maxSizeBytes + ", 
maxReadPageBytes=" + maxReadPageBytes + ", maxReadPageMessages=" + 
maxReadPageMessages + ", prefetchPageBytes=" + prefetchPageBytes + ", 
prefetchPageMessages=" + prefetchPageMessages + ", pageLimitBytes=" + 
pageLimitBytes + ", pageLimitMessages=" + pageLimitMessages + ", 
pageFullMessagePolicy=" + pageFullMessagePolicy + ", maxSizeMessages=" + 
maxSizeMessages +  [...]
+      return "AddressSettings{" + "addressFullMessagePolicy=" + 
addressFullMessagePolicy + ", maxSizeBytes=" + maxSizeBytes + ", 
maxReadPageBytes=" + maxReadPageBytes + ", maxReadPageMessages=" + 
maxReadPageMessages + ", prefetchPageBytes=" + prefetchPageBytes + ", 
prefetchPageMessages=" + prefetchPageMessages + ", pageLimitBytes=" + 
pageLimitBytes + ", pageLimitMessages=" + pageLimitMessages + ", 
pageFullMessagePolicy=" + pageFullMessagePolicy + ", maxSizeMessages=" + 
maxSizeMessages +  [...]
              + '}';
    }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact


Reply via email to