Repository: activemq-artemis
Updated Branches:
  refs/heads/master 22c6f4034 -> f0ce8a85a


no jira - possible null pointer


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

Branch: refs/heads/master
Commit: bffbca8f64373a192c9d9b0ca24e6b9d3203e89a
Parents: 22c6f40
Author: Andy Taylor <[email protected]>
Authored: Wed Apr 5 11:56:32 2017 +0100
Committer: Andy Taylor <[email protected]>
Committed: Wed Apr 5 11:56:32 2017 +0100

----------------------------------------------------------------------
 .../core/persistence/impl/journal/LargeServerMessageImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bffbca8f/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
----------------------------------------------------------------------
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
index 2c3e01c..7d652c9 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
@@ -321,7 +321,7 @@ public final class LargeServerMessageImpl extends 
CoreMessage implements LargeSe
    public String toString() {
       return "LargeServerMessage[messageID=" + messageID + ",durable=" + 
isDurable() + ",userID=" + getUserID() + ",priority=" + this.getPriority() +
          ", timestamp=" + toDate(getTimestamp()) + ",expiration=" + 
toDate(getExpiration()) +
-         ", durable=" + durable + ", address=" + getAddress() + ",properties=" 
+ properties.toString() + "]@" + System.identityHashCode(this);
+         ", durable=" + durable + ", address=" + getAddress() + ",properties=" 
+ (properties != null ? properties.toString() : "") + "]@" + 
System.identityHashCode(this);
    }
 
    @Override

Reply via email to