Add fallback to parentProps messageId

jlavallee · Apr 6, 2015 · 2cf5ea5 · 2cf5ea5
1 parent 0154fea
commit 2cf5ea5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/com/zeroclue/jmeter/protocol/amqp/AMQPPublisher.java b/src/main/com/zeroclue/jmeter/protocol/amqp/AMQPPublisher.java
@@ -238,12 +238,13 @@ protected AMQP.BasicProperties getProperties() {
         AMQP.BasicProperties parentProps = super.getProperties();
 
         int deliveryMode = getPersistent() ? 2 : 1;
+        String messageId = getMessageId().isEmpty() ? parentProps.getMessageId() : getMessageId();
 
         AMQP.BasicProperties publishProperties =
                 new AMQP.BasicProperties(parentProps.getContentType(), parentProps.getContentEncoding(),
                 parentProps.getHeaders(), deliveryMode, parentProps.getPriority(),
                 getCorrelationId(), getReplyToQueue(), parentProps.getExpiration(),
-                getMessageId(), parentProps.getTimestamp(), getMessageType(),
+                messageId, parentProps.getTimestamp(), getMessageType(),
                 parentProps.getUserId(), parentProps.getAppId(), parentProps.getClusterId());
 
         return publishProperties;