[activemq-artemis] branch master updated: NO-JIRA Remove unnecessary null-check in ExpiryScanner

[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 3797b62  NO-JIRA Remove unnecessary null-check in ExpiryScanner
     new 41991e2  This closes #2961
3797b62 is described below

commit 3797b62420386abab35a82e96d8abc24279bc903
Author: Sebastian Thomschke <sebt...@users.noreply.github.com>
AuthorDate: Fri Jan 31 09:22:47 2020 +0100

    NO-JIRA Remove unnecessary null-check in ExpiryScanner
---
 .../java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 d03494a..5aea38c 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
@@ -2270,11 +2270,8 @@ public class QueueImpl extends CriticalComponentImpl 
implements Queue {
          }
 
          if (!expiredMessages.isEmpty()) {
-            Transaction tx = new TransactionImpl(storageManager);
+            final Transaction tx = new TransactionImpl(storageManager);
             for (MessageReference ref : expiredMessages) {
-               if (tx == null) {
-                  tx = new TransactionImpl(storageManager);
-               }
                try {
                   expire(tx, ref);
                   refRemoved(ref);