(activemq) branch activemq-6.3.x updated: [#2271] Update Producer getDeliveryDelay() to always return zero (0) (#2272) (#2403)

[mattrpav]

This is an automated email from the ASF dual-hosted git repository.

mattrpav pushed a commit to branch activemq-6.3.x
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/activemq-6.3.x by this push:
     new d5a80f63e6 [#2271] Update Producer getDeliveryDelay() to always return 
zero (0) (#2272) (#2403)
d5a80f63e6 is described below

commit d5a80f63e61eef7f65656387164b37ec24844cef
Author: Matt Pavlovich <mattr...@apache.org>
AuthorDate: Wed Aug 5 12:34:36 2026 -0500

    [#2271] Update Producer getDeliveryDelay() to always return zero (0) 
(#2272) (#2403)
    
    - Fixes messagehub jms pool w/ Spring Boot
    
    (cherry picked from commit 4da5d4e76af4e53132b39fba8cc20bb4a69c0a28)
---
 .../java/org/apache/activemq/ActiveMQMessageProducerSupport.java | 2 +-
 .../src/main/java/org/apache/activemq/ActiveMQProducer.java      | 2 +-
 .../main/java/org/apache/activemq/jms/pool/PooledProducer.java   | 2 +-
 .../java/org/apache/activemq/ra/InboundMessageProducerProxy.java | 2 +-
 .../java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java   | 9 +++++++--
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
index 5816d70e30..ab5e21cf0f 100644
--- 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
+++ 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
@@ -68,7 +68,7 @@ public abstract class ActiveMQMessageProducerSupport 
implements MessageProducer,
      */
     @Override
     public long getDeliveryDelay() throws JMSException {
-        throw new UnsupportedOperationException("getDeliveryDelay() is not 
supported");
+        return 0L;
     }
     
     /**
diff --git 
a/activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java 
b/activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java
index abf7493024..a1046d85e0 100644
--- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java
+++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java
@@ -251,7 +251,7 @@ public class ActiveMQProducer implements JMSProducer {
 
     @Override
     public long getDeliveryDelay() {
-        throw new UnsupportedOperationException("getDeliveryDelay() is not 
supported");
+        return 0L;
     }
 
     @Override
diff --git 
a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java
 
b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java
index 1d1176f525..1d4adc5959 100644
--- 
a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java
+++ 
b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java
@@ -156,7 +156,7 @@ public class PooledProducer implements MessageProducer {
      */
     @Override
     public long getDeliveryDelay() throws JMSException {
-        throw new UnsupportedOperationException("getDeliveryDelay() is not 
supported");
+        return 0L;
     }
 
     @Override
diff --git 
a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java
 
b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java
index f99e1cef49..7f8743cb30 100644
--- 
a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java
+++ 
b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java
@@ -218,6 +218,6 @@ public class InboundMessageProducerProxy implements 
MessageProducer, QueueSender
      */
     @Override
     public long getDeliveryDelay() throws JMSException {
-        throw new UnsupportedOperationException("getDeliveryDelay() is not 
supported");
+        return 0L;
     }
 }
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java
index b5f5467931..5334546aa5 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java
@@ -289,9 +289,14 @@ public class ActiveMQJMS2ContextTest extends 
ActiveMQJMS2TestBase {
         session.createSharedDurableConsumer(session.createTopic("test"), null, 
null);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test
     public void testProducerDeliveryDelayGet() throws JMSException {
-        messageProducer.getDeliveryDelay();
+        assertEquals(0L, messageProducer.getDeliveryDelay());
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void testProducerDeliveryDelaySetZero() throws JMSException {
+        messageProducer.setDeliveryDelay(0L);
     }
 
     @Test(expected = UnsupportedOperationException.class)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@activemq.apache.org
For additional commands, e-mail: commits-h...@activemq.apache.org
For further information, visit: https://activemq.apache.org/contact