activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cshan...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-6477
Date Thu, 27 Oct 2016 19:54:24 GMT
Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x a2c7433e7 -> 4cbe692bc


https://issues.apache.org/jira/browse/AMQ-6477

simplifying isMarshalled method

(cherry picked from commit 0a80165a99bff33bfaeeb8fe1dc7b5a8e6f50830)


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/4cbe692b
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/4cbe692b
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/4cbe692b

Branch: refs/heads/activemq-5.14.x
Commit: 4cbe692bccb5bb246a2099f8504e103ac90079be
Parents: a2c7433
Author: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Authored: Thu Oct 27 15:52:39 2016 -0400
Committer: Christopher L. Shannon (cshannon) <christopher.l.shannon@gmail.com>
Committed: Thu Oct 27 15:54:09 2016 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/activemq/command/Message.java        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/4cbe692b/activemq-client/src/main/java/org/apache/activemq/command/Message.java
----------------------------------------------------------------------
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 13e0030..ca2aee7 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) {


Mime
View raw message