activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject activemq-artemis git commit: fixing NPE
Date Sat, 04 Mar 2017 19:48:46 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/artemis-1009 80f6ae6ba -> 1b9125f8b


fixing NPE


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

Branch: refs/heads/artemis-1009
Commit: 1b9125f8bf69b9725467b3f7a67c76fd942b1fbb
Parents: 80f6ae6
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Sat Mar 4 14:48:40 2017 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Sat Mar 4 14:48:40 2017 -0500

----------------------------------------------------------------------
 .../apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b9125f8/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index a533760..7578f7f 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -784,7 +784,7 @@ public class AMQPMessage extends RefCountMessage {
    @Override
    public AMQPMessage setReplyTo(SimpleString address) {
       if (getProperties() != null) {
-         getProperties().setReplyTo(address.toString());
+         getProperties().setReplyTo(address != null ? address.toString() : null);
       }
       return this;
    }


Mime
View raw message