bugfix: Maintain DeliveryMode when setting MQMD header properties - #51

Author: matrober-uk

mqjms/ProducerImpl.go

@@ -84,14 +84,6 @@ func (producer ProducerImpl) Send(dest jms20subset.Destination, msg jms20subset.
 		pmo.Options |= ibmmq.MQPMO_ASYNC_RESPONSE
 	}
 
-	// Convert the JMS persistence into the equivalent MQ message descriptor
-	// attribute.
-	if producer.deliveryMode == jms20subset.DeliveryMode_NON_PERSISTENT {
-		putmqmd.Persistence = ibmmq.MQPER_NOT_PERSISTENT
-	} else {
-		putmqmd.Persistence = ibmmq.MQPER_PERSISTENT
-	}
-
 	var buffer []byte
 
 	// We have a "Message" object and can use a switch to safely convert it
@@ -145,6 +137,14 @@ func (producer ProducerImpl) Send(dest jms20subset.Destination, msg jms20subset.
 		log.Fatal(jms20subset.CreateJMSException("UnexpectedMessageType", "UnexpectedMessageType-send1", nil))
 	}
 
+	// Convert the JMS persistence into the equivalent MQ message descriptor
+	// attribute.
+	if producer.deliveryMode == jms20subset.DeliveryMode_NON_PERSISTENT {
+		putmqmd.Persistence = ibmmq.MQPER_NOT_PERSISTENT
+	} else {
+		putmqmd.Persistence = ibmmq.MQPER_PERSISTENT
+	}
+
 	// If the producer has a TTL specified then apply it to the put MQMD so
 	// that MQ will honour it.
 	if producer.timeToLive > 0 {

priority_test.go

@@ -76,6 +76,7 @@ func TestPrioritySetGet(t *testing.T) {
 	// Go again with a different priority.
 	newMsgPriority := 2
 	producer = producer.SetPriority(newMsgPriority)
+	producer = producer.SetDeliveryMode(jms20subset.DeliveryMode_PERSISTENT)
 	assert.Equal(t, newMsgPriority, producer.GetPriority())
 
 	errSend = producer.Send(queue, txtMsg)
@@ -95,11 +96,13 @@ func TestPrioritySetGet(t *testing.T) {
 	// Check the Priority
 	gotPropValue = rcvMsg.GetJMSPriority()
 	assert.Equal(t, newMsgPriority, gotPropValue)
+	assert.Equal(t, jms20subset.DeliveryMode_PERSISTENT, rcvMsg.GetJMSDeliveryMode())
 
 	// -------
 	// Go again with a different priority.
 	newMsgPriority2 := 7
 	producer = producer.SetPriority(newMsgPriority2)
+	producer = producer.SetDeliveryMode(jms20subset.DeliveryMode_NON_PERSISTENT)
 	assert.Equal(t, newMsgPriority2, producer.GetPriority())
 
 	errSend = producer.Send(queue, txtMsg)
@@ -119,6 +122,7 @@ func TestPrioritySetGet(t *testing.T) {
 	// Check the Priority
 	gotPropValue = rcvMsg.GetJMSPriority()
 	assert.Equal(t, newMsgPriority2, gotPropValue)
+	assert.Equal(t, jms20subset.DeliveryMode_NON_PERSISTENT, rcvMsg.GetJMSDeliveryMode())
 
 }