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

[gtully]

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 475d349  ARTEMIS-3446 - tidy up cli set code based on static analysis
475d349 is described below

commit 475d349a2381a81fd37a5ce6ebf48dca2b36f53f
Author: gtully <gary.tu...@gmail.com>
AuthorDate: Thu Sep 9 13:29:01 2021 +0100

    ARTEMIS-3446 - tidy up cli set code based on static analysis
---
 .../activemq/artemis/cli/commands/activation/ActivationSequenceSet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceSet.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceSet.java
index 44152c6..3e23f86 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceSet.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceSet.java
@@ -97,7 +97,7 @@ public class ActivationSequenceSet extends LockAbstract {
       try {
          if (coordinationId != null) {
             // force using coordinationId whatever it is - either for 
multi-primary or just forced through CLI
-            if (!coordinationId.equals(nodeManager.getNodeId())) {
+            if (nodeManager.getNodeId() == null || 
!nodeManager.getNodeId().toString().equals(coordinationId)) {
                nodeManager = applyCoordinationId(coordinationId, nodeManager, 
config.getNodeManagerLockLocation());
             }
          }