[activemq-artemis] branch main updated: ARTEMIS-3446 - tidy up cli code based on static analysis

[gt...@apache.org]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new dbdd941  ARTEMIS-3446 - tidy up cli code based on static analysis
dbdd941 is described below

commit dbdd941c49dfabc98310a3aa5c5cd1640e6c4c7d
Author: gtully <ga...@gmail.com>
AuthorDate: Thu Sep 9 13:22:56 2021 +0100

    ARTEMIS-3446 - tidy up cli code based on static analysis
---
 .../artemis/cli/commands/activation/ActivationSequenceList.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceList.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceList.java
index 990b78e..13d22f1 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceList.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceList.java
@@ -108,7 +108,7 @@ public class ActivationSequenceList extends LockAbstract {
       try {
          if (nodeManager != null) {
             if (coordinationId != null) {
-               if (!coordinationId.equals(nodeManager.getNodeId())) {
+               if (nodeManager.getNodeId() == null || !nodeManager.getNodeId().toString().equals(coordinationId)) {
                   nodeManager = applyCoordinationId(coordinationId, nodeManager, config.getNodeManagerLockLocation());
                }
             }
@@ -120,7 +120,7 @@ public class ActivationSequenceList extends LockAbstract {
          } else {
             assert nodeId != null;
          }
-         if (!remote) {
+         if (!remote && nodeManager != null) {
             final long localActivationSequence = nodeManager.getNodeActivationSequence();
             if (localActivationSequence == NodeManager.NULL_NODE_ACTIVATION_SEQUENCE) {
                if (out != null) {