Fix compile error from PR #23

aliesbelik · Apr 15, 2015 · 49aa1d5 · 49aa1d5
1 parent fa8fc2d
commit 49aa1d5
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/main/java/com/zeroclue/jmeter/protocol/amqp/AMQPPublisher.java b/src/main/java/com/zeroclue/jmeter/protocol/amqp/AMQPPublisher.java
@@ -236,18 +236,19 @@ protected AMQP.BasicProperties getProperties() {
         AMQP.BasicProperties.Builder builder = new AMQP.BasicProperties.Builder();
 
         int deliveryMode = getPersistent() ? 2 : 1;
-        String messageId = getMessageId().isEmpty() ? parentProps.getMessageId() : getMessageId();
 
-        return builder
-                .contentType("text/plain")
-                .deliveryMode(deliveryMode)
-                .priority(0)
-                .correlationId(getCorrelationId())
-                .replyTo(getReplyToQueue())
-                .type(getMessageType())
-                .headers(prepareHeaders())
-                .messageId(messageId)
-                .build();
+        builder.contentType("text/plain")
+            .deliveryMode(deliveryMode)
+            .priority(0)
+            .correlationId(getCorrelationId())
+            .replyTo(getReplyToQueue())
+            .type(getMessageType())
+            .headers(prepareHeaders())
+            .build();
+        if (getMessageId() != null && getMessageId().isEmpty()) {
+            builder.messageId(getMessageId());
+        }
+        return builder.build();
     }
 
     protected boolean initChannel() throws IOException, NoSuchAlgorithmException, KeyManagementException {