[activemq-artemis] branch master updated: ARTEMIS-2306 Fixing Test and possible NPE

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 45121ea  ARTEMIS-2306 Fixing Test and possible NPE
45121ea is described below

commit 45121eade2035f470d4d092cc82c17ff39bf549a
Author: Clebert Suconic <clebertsuco...@apache.org>
AuthorDate: Mon Apr 22 21:44:02 2019 -0400

    ARTEMIS-2306 Fixing Test and possible NPE
---
 .../apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 3320816..a4766ef 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -3016,7 +3016,7 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
             long delayBeforeDispatch = config.getDelayBeforeDispatch() == null 
? as.getDefaultDelayBeforeDispatch() : config.getDelayBeforeDispatch();
 
             if (locateQueue(queueName) != null && 
locateQueue(queueName).getAddress().toString().equals(config.getAddress())) {
-               updateQueue(config.getName(), config.getRoutingType(), 
config.getFilterString(), maxConsumers, config.getPurgeOnNoConsumers(), 
isExclusive, groupRebalance, groupBuckets, groupFirstKey.toString(), 
isNonDestructive, consumersBeforeDispatch, delayBeforeDispatch, 
config.getUser(), true);
+               updateQueue(config.getName(), config.getRoutingType(), 
config.getFilterString(), maxConsumers, config.getPurgeOnNoConsumers(), 
isExclusive, groupRebalance, groupBuckets, groupFirstKey != null ? 
groupFirstKey.toString() : null, isNonDestructive, consumersBeforeDispatch, 
delayBeforeDispatch, config.getUser(), true);
             } else {
                // if the address::queue doesn't exist then create it
                try {