Skip to content

[#2271] Update Producer deliveryDelay behavior to only thrown when non-zero and always return zero #2272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattrpav wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[#2271] Update Producer deliveryDelay behavior to only thrown when non-zero and always return zero #2272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ public ActiveMQMessageProducerSupport(ActiveMQSession session) {
*/
@Override
public void setDeliveryDelay(long deliveryDelay) throws JMSException {
throw new UnsupportedOperationException("setDeliveryDelay() is not supported");
if (deliveryDelay != 0) {

@cshannon cshannon Aug 4, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My preference would be to leave the setter alone. I don't think we should allow using it as it's not supported, the getter can just return 0 for now, meaning there's just no delay.

throw new UnsupportedOperationException("setDeliveryDelay() is not supported");
}
}

/**
Expand All @@ -68,7 +70,7 @@ public void setDeliveryDelay(long deliveryDelay) throws JMSException {
*/
@Override
public long getDeliveryDelay() throws JMSException {
throw new UnsupportedOperationException("getDeliveryDelay() is not supported");
return 0L;
}

/**
Expand Down
8 changes: 6 additions & 2 deletions activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,16 @@ public long getTimeToLive() {

@Override
public JMSProducer setDeliveryDelay(long deliveryDelay) {
throw new UnsupportedOperationException("setDeliveryDelay(long) is not supported");
if (deliveryDelay != 0L) {
throw new UnsupportedOperationException("setDeliveryDelay(long) is not supported");
}

return this;
}

@Override
public long getDeliveryDelay() {
throw new UnsupportedOperationException("getDeliveryDelay() is not supported");
return 0L;

@cshannon cshannon Aug 3, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentation looks off

}

@Override
Expand Down
6 changes: 4 additions & 2 deletions activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,9 @@ public void send(Destination destination, Message message, int deliveryMode, int
*/
@Override
public void setDeliveryDelay(long deliveryDelay) throws JMSException {
throw new UnsupportedOperationException("setDeliveryDelay() is not supported");
if (deliveryDelay != 0L) {
throw new UnsupportedOperationException("setDeliveryDelay() is not supported");
}
}

/**
Expand All @@ -156,7 +158,7 @@ public void setDeliveryDelay(long deliveryDelay) throws JMSException {
*/
@Override
public long getDeliveryDelay() throws JMSException {
throw new UnsupportedOperationException("getDeliveryDelay() is not supported");
return 0L;
}

@Override
Expand Down
6 changes: 4 additions & 2 deletions activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,9 @@ public void send(Destination destination, Message message, int deliveryMode, int
*/
@Override
public void setDeliveryDelay(long deliveryDelay) throws JMSException {
throw new UnsupportedOperationException("setDeliveryDelay() is not supported");
if (deliveryDelay != 0L) {
throw new UnsupportedOperationException("setDeliveryDelay() is not supported");
}
}

/**
Expand All @@ -218,6 +220,6 @@ public void setDeliveryDelay(long deliveryDelay) throws JMSException {
*/
@Override
public long getDeliveryDelay() throws JMSException {
throw new UnsupportedOperationException("getDeliveryDelay() is not supported");
return 0L;
}
}
9 changes: 7 additions & 2 deletions activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,14 @@ public void testSessionSharedDurableConsumerSelector() throws JMSException {
session.createSharedDurableConsumer(session.createTopic("test"), null, null);
}

@Test(expected = UnsupportedOperationException.class)
@Test
public void testProducerDeliveryDelayGet() throws JMSException {
messageProducer.getDeliveryDelay();
assertEquals(0L, messageProducer.getDeliveryDelay());
}

@Test
public void testProducerDeliveryDelaySetZero() throws JMSException {
messageProducer.setDeliveryDelay(0L);
}

@Test(expected = UnsupportedOperationException.class)
Expand Down
Loading