From 4cbe692bccb5bb246a2099f8504e103ac90079be Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon (cshannon)" <christopher.l.shannon@gmail.com>
Date: Thu, 27 Oct 2016 15:52:39 -0400
Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-6477

simplifying isMarshalled method

(cherry picked from commit 0a80165a99bff33bfaeeb8fe1dc7b5a8e6f50830)
---
 .../src/main/java/org/apache/activemq/command/Message.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/activemq-client/src/main/java/org/apache/activemq/command/Message.java b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
index 13e00304b6..ca2aee7c60 100755
--- a/activemq-client/src/main/java/org/apache/activemq/command/Message.java
+++ b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
@@ -124,8 +124,7 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess
     }
 
     public boolean isMarshalled() {
-        return content != null && (marshalledProperties != null ||
-                (marshalledProperties == null && properties == null));
+        return content != null && (marshalledProperties != null || properties == null);
     }
 
     protected void copy(Message copy) {