ARTEMIS-992 NPE on startup
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/81b5563a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/81b5563a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/81b5563a Branch: refs/heads/master Commit: 81b5563a52ab56cbc30e91fcdd274985af13d0d8 Parents: fd0513e Author: Justin Bertram <[email protected]> Authored: Thu Mar 30 14:19:56 2017 -0500 Committer: Clebert Suconic <[email protected]> Committed: Thu Mar 30 21:20:14 2017 -0400 ---------------------------------------------------------------------- .../activemq/artemis/core/server/ActiveMQServerLogger.java | 3 +++ .../artemis/core/server/cluster/ClusterController.java | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/81b5563a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java index b96a7a0..4ef12fa 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java @@ -1574,4 +1574,7 @@ public interface ActiveMQServerLogger extends BasicLogger { @Message(id = 224075, value = "Cannot find pageTX id = {0}", format = Message.Format.MESSAGE_FORMAT) void journalCannotFindPageTX(Long id); + @LogMessage(level = Logger.Level.ERROR) + @Message(id = 224076, value = "No cluster locator found. This server will not participate in a cluster. Ensure a valid cluster-connection is configured.", format = Message.Format.MESSAGE_FORMAT) + void noClusterLocatorFound(); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/81b5563a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java index 98b550e..0849d0e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterController.java @@ -106,6 +106,9 @@ public class ClusterController implements ActiveMQComponent { } else { replicationLocator = defaultLocator; } + if (replicationLocator == null) { + ActiveMQServerLogger.LOGGER.noClusterLocatorFound(); + } //latch so we know once we are connected replicationClusterConnectedLatch = new CountDownLatch(1); //and add the quorum manager as a topology listener @@ -198,7 +201,9 @@ public class ClusterController implements ActiveMQComponent { * @param listener */ public void addClusterTopologyListenerForReplication(ClusterTopologyListener listener) { - replicationLocator.addClusterTopologyListener(listener); + if (replicationLocator != null) { + replicationLocator.addClusterTopologyListener(listener); + } } /**
