[activemq-artemis] branch master updated: NO-JIRA Wrong autoDeleteDelay value passed to createSharedQueue

[jbertram]

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

jbertram 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 85a1c75  NO-JIRA Wrong autoDeleteDelay value passed to 
createSharedQueue
     new bfd943a  This closes #2962
85a1c75 is described below

commit 85a1c753d7981cd64e0a4878e2c9acae3a806f51
Author: Sebastian Thomschke <sebt...@users.noreply.github.com>
AuthorDate: Fri Jan 31 09:53:02 2020 +0100

    NO-JIRA Wrong autoDeleteDelay value passed to createSharedQueue
---
 .../org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 53ac774..d32a8ef 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -987,7 +987,7 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
                                consumersBeforeDispatch == null ? 
as.getDefaultConsumersBeforeDispatch() : consumersBeforeDispatch,
                                delayBeforeDispatch == null ? 
as.getDefaultDelayBeforeDispatch() : delayBeforeDispatch,
                                autoDelete == null ? 
as.isAutoDeleteCreatedQueues() : autoDelete,
-                               autoDeleteDelay == null ? 
as.getAutoDeleteQueuesDelay() : delayBeforeDispatch,
+                               autoDeleteDelay == null ? 
as.getAutoDeleteQueuesDelay() : autoDeleteDelay,
                                autoDeleteMessageCount == null ? 
as.getAutoDeleteQueuesMessageCount() : autoDeleteMessageCount);
    }