Enforce non-negative delivery delay in strictCompliance mode

activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java

@@ -84,6 +84,8 @@ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport impl
     private MessageTransformer transformer;
     private MemoryUsage producerWindow;
 
+    protected long deliveryDelay = 0;
+
     protected ActiveMQMessageProducer(ActiveMQSession session, ProducerId producerId, ActiveMQDestination destination, int sendTimeout) throws JMSException {
         super(session);
         this.info = new ProducerInfo(producerId);
@@ -219,6 +221,25 @@ protected void checkClosed() throws IllegalStateException {
      * @see jakarta.jms.Session#createProducer
      * @since 1.1
      */
+
+    @Override
+    public void setDeliveryDelay(long deliveryDelay) throws JMSException {
+        checkClosed();
+
+        // Jakarta 3.1 Compliance Guard
+        if (deliveryDelay < 0 && session.connection.isStrictCompliance()) {
+            throw new jakarta.jms.MessageFormatException("Delivery delay cannot be negative when strictCompliance is enabled.");
+        }
+
+        this.deliveryDelay = deliveryDelay;
+    }
+
+    @Override
+    public long getDeliveryDelay() throws JMSException {
+        checkClosed();
+        return this.deliveryDelay;
+    }
+
     @Override
     public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException {
         this.send(destination, message, deliveryMode, priority, timeToLive, (AsyncCallback)null);

activemq-unit-tests/src/test/java/org/apache/activemq/ActiveMQMessageProducerTest.java

@@ -0,0 +1,57 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq;
+
+import jakarta.jms.Connection;
+import jakarta.jms.MessageProducer;
+import org.junit.Test;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.apache.activemq.command.DataStructureTestSupport.assertEquals;
+import static org.junit.Assert.fail;
+
+public class ActiveMQMessageProducerTest {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ActiveMQMessageProducerTest.class);
+
+    @Test
+    public void testStrictComplianceDeliveryDelay() throws Exception {
+        ActiveMQConnectionFactory factory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+
+        // Strict Mode ON (Should block negative values)
+        factory.setStrictCompliance(true);
+        try (Connection conn = factory.createConnection()) {
+            MessageProducer producer = conn.createSession(false, 1).createProducer(null);
+            try {
+                producer.setDeliveryDelay(-100);
+                fail("Should have thrown MessageFormatException");
+            } catch (jakarta.jms.MessageFormatException e) {
+                LOG.debug("Caught expected strict compliance exception");
+            }
+        }
+
+        // Strict Mode OFF (Should allow negative values (Legacy behavior))
+        factory.setStrictCompliance(false);
+        try (Connection conn = factory.createConnection()) {
+            MessageProducer producer = conn.createSession(false, 1).createProducer(null);
+            producer.setDeliveryDelay(-100);
+            assertEquals(-100, producer.getDeliveryDelay());
+        }
+    }
+}

activemq-unit-tests/src/test/java/org/apache/activemq/jms2/ActiveMQJMS2ContextTest.java

@@ -289,14 +289,17 @@ public void testSessionSharedDurableConsumerSelector() throws JMSException {
         session.createSharedDurableConsumer(session.createTopic("test"), null, null);
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test // REMOVED (expected = UnsupportedOperationException.class)
     public void testProducerDeliveryDelayGet() throws JMSException {
-        messageProducer.getDeliveryDelay();
+        // Assert that the default is 0
+        assertEquals(0L, messageProducer.getDeliveryDelay());
     }
 
-    @Test(expected = UnsupportedOperationException.class)
+    @Test // REMOVED (expected = UnsupportedOperationException.class)
     public void testProducerDeliveryDelaySet() throws JMSException {
-        messageProducer.setDeliveryDelay(1000l);
+        messageProducer.setDeliveryDelay(1000L);
+        // Verify the value was actually stored
+        assertEquals(1000L, messageProducer.getDeliveryDelay());
     }
 
     @Test(expected = UnsupportedOperationException.class)