QPIDJMS-207 Fix MessageProducer getDeliveryDelay, add test
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java
index 6e9c96d..64cdf8b 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageProducer.java
@@ -114,7 +114,7 @@
     @Override
     public long getDeliveryDelay() throws JMSException {
         checkClosed();
-        return deliveryMode;
+        return deliveryDelay;
     }
 
     @Override
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java
index a2629a9..319ce3f 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java
@@ -133,6 +133,14 @@
     }
 
     @Test(timeout = 10000)
+    public void testDeliveryDelayConfiguration() throws Exception {
+        MessageProducer producer = session.createProducer(null);
+        assertEquals(Message.DEFAULT_DELIVERY_DELAY, producer.getDeliveryDelay());
+        producer.setDeliveryDelay(2000);
+        assertEquals(2000, producer.getDeliveryDelay());
+    }
+
+    @Test(timeout = 10000)
     public void testAnonymousProducerThrowsUOEWhenExplictDestinationNotProvided() throws Exception {
         JmsMessageProducer producer = (JmsMessageProducer) session.createProducer(null);