From 5f939cf61f43f2be3570527f4238e4ea1b220f08 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Sat, 1 Apr 2017 15:57:37 -0400 Subject: [PATCH] ARTEMIS-992 Reverting 'ERROR' message Commit 81b5563a52ab56cbc30e91fcdd274985af13d0d8 introduced an error message even if you start a regular non clustered server. --- .../activemq/artemis/core/server/ActiveMQServerLogger.java | 4 ---- .../artemis/core/server/cluster/ClusterController.java | 3 --- 2 files changed, 7 deletions(-) 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 4ef12fa750..d89c356f10 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 @@ -1573,8 +1573,4 @@ public interface ActiveMQServerLogger extends BasicLogger { @LogMessage(level = Logger.Level.ERROR) @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(); } 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 0849d0e733..e88b14d8a3 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,9 +106,6 @@ 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