You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/02/23 22:08:51 UTC
[1/2] activemq-artemis git commit: ARTEMIS-992 deal w/bad
connector-ref in cluster-cxn
Repository: activemq-artemis
Updated Branches:
refs/heads/1.x 1f054f04a -> 20d627f2b
ARTEMIS-992 deal w/bad connector-ref in cluster-cxn
(cherry picked from commit c7e0a921819cd39896e11bbfa008432633a88581)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2b18db6a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2b18db6a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2b18db6a
Branch: refs/heads/1.x
Commit: 2b18db6a1cf39d9ca46e64962ff34a3d305edd4d
Parents: 1f054f0
Author: Justin Bertram <jb...@apache.org>
Authored: Thu Feb 23 14:41:07 2017 -0600
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Feb 23 16:53:56 2017 -0500
----------------------------------------------------------------------
.../artemis/core/deployers/impl/FileConfigurationParser.java | 5 +++++
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 3 +++
.../activemq/artemis/core/server/cluster/ClusterController.java | 4 ++++
3 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2b18db6a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index bfb9f84..087a6fb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -1268,6 +1268,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
String connectorName = getString(e, "connector-ref", null, Validators.NOT_NULL_OR_EMPTY);
+ if (!mainConfig.getConnectorConfigurations().containsKey(connectorName)) {
+ ActiveMQServerLogger.LOGGER.connectorRefNotFound(connectorName, name);
+ return;
+ }
+
boolean duplicateDetection = getBoolean(e, "use-duplicate-detection", ActiveMQDefaultConfiguration.isDefaultClusterDuplicateDetection());
MessageLoadBalancingType messageLoadBalancingType;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2b18db6a/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 7e219c6..332e890 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
@@ -1283,6 +1283,9 @@ public interface ActiveMQServerLogger extends BasicLogger {
format = Message.Format.MESSAGE_FORMAT)
void negativeGlobalAddressSize(long size);
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 222217, value = "Cannot find connector-ref {0}. The cluster-connection {1} will not be deployed.", format = Message.Format.MESSAGE_FORMAT)
+ void connectorRefNotFound(String connectorRef, String clusterConnection);
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 224000, value = "Failure in initialisation", format = Message.Format.MESSAGE_FORMAT)
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2b18db6a/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 15595f8..b47dca9 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
@@ -317,6 +317,10 @@ public class ClusterController implements ActiveMQComponent {
@Override
public void handlePacket(Packet packet) {
+ if (!isStarted()) {
+ return;
+ }
+
if (!authorized) {
if (packet.getType() == PacketImpl.CLUSTER_CONNECT) {
ClusterConnection clusterConnection = acceptorUsed.getClusterConnection();
[2/2] activemq-artemis git commit: ARTEMIS-989 fixing test after
cherry-picking
Posted by cl...@apache.org.
ARTEMIS-989 fixing test after cherry-picking
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/20d627f2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/20d627f2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/20d627f2
Branch: refs/heads/1.x
Commit: 20d627f2b7b97cf50ab59df7f869ccea0376ac7c
Parents: 2b18db6
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Feb 23 17:03:31 2017 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Feb 23 17:06:37 2017 -0500
----------------------------------------------------------------------
.../artemis/tests/integration/jms/consumer/ConsumerTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/20d627f2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java
index 078be00..42550e7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/consumer/ConsumerTest.java
@@ -187,7 +187,7 @@ public class ConsumerTest extends JMSTestBase {
@Test
public void testIndividualACKJms2() throws Exception {
JMSContext context = cf.createContext(ActiveMQJMSConstants.INDIVIDUAL_ACKNOWLEDGE);
- jBossQueue = ActiveMQJMSClient.createQueue(JmsConsumerTest.Q_NAME);
+ jBossQueue = ActiveMQJMSClient.createQueue(ConsumerTest.Q_NAME);
JMSProducer producer = context.createProducer();
JMSConsumer consumer = context.createConsumer(jBossQueue);
int noOfMessages = 100;
@@ -224,8 +224,8 @@ public class ConsumerTest extends JMSTestBase {
Assert.assertEquals("m" + i, m.getText());
}
- SimpleString queueName = new SimpleString(JmsConsumerTest.Q_NAME);
- Assert.assertEquals(0, ((Queue) server.getPostOffice().getBinding(queueName).getBindable()).getDeliveringCount());
+ SimpleString queueName = new SimpleString(ActiveMQDestination.JMS_QUEUE_ADDRESS_PREFIX + ConsumerTest.Q_NAME);
+ Assert.assertEquals(0, getMessageCount((Queue) server.getPostOffice().getBinding(queueName).getBindable()));
Assert.assertEquals(0, getMessageCount((Queue) server.getPostOffice().getBinding(queueName).getBindable()));
context.close();
}