activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [2/2] activemq-artemis git commit: ARTEMIS-992 Reverting 'ERROR' message
Date Sat, 01 Apr 2017 19:59:34 GMT
ARTEMIS-992 Reverting 'ERROR' message

Commit 81b5563a52ab56cbc30e91fcdd274985af13d0d8 introduced an error message
even if you start a regular non clustered server.


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5f939cf6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5f939cf6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5f939cf6

Branch: refs/heads/master
Commit: 5f939cf61f43f2be3570527f4238e4ea1b220f08
Parents: afd1835
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Sat Apr 1 15:57:37 2017 -0400
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Sat Apr 1 15:57:41 2017 -0400

----------------------------------------------------------------------
 .../activemq/artemis/core/server/ActiveMQServerLogger.java       | 4 ----
 .../activemq/artemis/core/server/cluster/ClusterController.java  | 3 ---
 2 files changed, 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5f939cf6/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 4ef12fa..d89c356 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();
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5f939cf6/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 0849d0e..e88b14d 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


Mime
View raw message