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

ARTEMIS-2334 avoid potential NPE

This commit is contained in:
Justin Bertram 2019-05-14 09:58:37 -05:00
parent 56e33bcacf
commit 984a901d6a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
View File

@ -3396,7 +3396,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
if (AuditLogger.isEnabled()) { if (AuditLogger.isEnabled()) {
AuditLogger.getNodeID(this.server); AuditLogger.getNodeID(this.server);
} }
return server.getNodeID().toString(); return server.getNodeID() == null ? null : server.getNodeID().toString();
} }
@Override @Override

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
View File

@ -542,7 +542,7 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
@Override @Override
public String getNodeID() { public String getNodeID() {
return nodeManager.getNodeId().toString(); return nodeManager == null ? null : (nodeManager.getNodeId() == null ? null : nodeManager.getNodeId().toString());
} }
@Override @Override