Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3446 - tidy up cli code based on static analysis

This commit is contained in:
gtully 2021-09-09 13:22:56 +01:00
parent 8fb5b8969f
commit dbdd941c49
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/activation/ActivationSequenceList.java
View File

@ -108,7 +108,7 @@ public class ActivationSequenceList extends LockAbstract {
try { try {
if (nodeManager != null) { if (nodeManager != null) {
if (coordinationId != null) { if (coordinationId != null) {
if (!coordinationId.equals(nodeManager.getNodeId())) { if (nodeManager.getNodeId() == null || !nodeManager.getNodeId().toString().equals(coordinationId)) {
nodeManager = applyCoordinationId(coordinationId, nodeManager, config.getNodeManagerLockLocation()); nodeManager = applyCoordinationId(coordinationId, nodeManager, config.getNodeManagerLockLocation());
} }
} }
@ -120,7 +120,7 @@ public class ActivationSequenceList extends LockAbstract {
} else { } else {
assert nodeId != null; assert nodeId != null;
} }
if (!remote) { if (!remote && nodeManager != null) {
final long localActivationSequence = nodeManager.getNodeActivationSequence(); final long localActivationSequence = nodeManager.getNodeActivationSequence();
if (localActivationSequence == NodeManager.NULL_NODE_ACTIVATION_SEQUENCE) { if (localActivationSequence == NodeManager.NULL_NODE_ACTIVATION_SEQUENCE) {
if (out != null) { if (out != null) {