You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/11/23 17:43:24 UTC

[23/48] activemq-artemis git commit: Fix HangConsumerTest

Fix HangConsumerTest


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

Branch: refs/heads/ARTEMIS-780
Commit: e91b04d58afb748811957f61c15d2e5201fcd0ed
Parents: fccea4a
Author: jbertram <jb...@apache.com>
Authored: Tue Nov 15 17:10:17 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Wed Nov 23 09:04:34 2016 -0600

----------------------------------------------------------------------
 .../org/apache/activemq/artemis/core/server/impl/QueueImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e91b04d5/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index f6da245..a2be58b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -367,7 +367,7 @@ public class QueueImpl implements Queue {
 
       this.address = address;
 
-      this.addressInfo = postOffice.getAddressInfo(address);
+      this.addressInfo = postOffice == null ? null : postOffice.getAddressInfo(address);
 
       this.name = name;