https://issues.apache.org/jira/browse/AMQ-3347 - network connector restart/re-add

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1130469 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartPlainTest.java

@@ -0,0 +1,24 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.network;
+
+public class NetworkRestartPlainTest extends NetworkRestartTest {
+    @Override
+    protected String getLocalBrokerURI() {
+        return "org/apache/activemq/network/localBroker-plain.xml";
+    }
+}

activemq-core/src/test/java/org/apache/activemq/network/NetworkRestartTest.java

@@ -72,6 +72,37 @@ public class NetworkRestartTest extends TestCase {
 
     }
 
+    public void testConnectorReAdd() throws Exception {
+        MessageConsumer remoteConsumer = remoteSession.createConsumer(included);
+        MessageProducer localProducer = localSession.createProducer(included);
+
+        localProducer.send(localSession.createTextMessage("before"));
+        Message before = remoteConsumer.receive(1000);
+        assertNotNull(before);
+        assertEquals("before", ((TextMessage)before).getText());
+
+        // restart connector
+
+        NetworkConnector connector = localBroker.getNetworkConnectorByName("networkConnector");
+
+        LOG.info("Removing connector");
+        connector.stop();
+        localBroker.removeNetworkConnector(connector);
+
+        Thread.sleep(5000);
+        LOG.info("Re-adding connector");
+        localBroker.addNetworkConnector(connector);
+        connector.start();
+
+        Thread.sleep(5000);
+
+
+        localProducer.send(localSession.createTextMessage("after"));
+        Message after = remoteConsumer.receive(1000);
+        assertNotNull(after);
+        assertEquals("after", ((TextMessage)after).getText());
+    }
+
 
     protected void setUp() throws Exception {
         super.setUp();

activemq-core/src/test/resources/org/apache/activemq/network/localBroker-plain.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<beans
+  xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
+  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+<broker brokerName="localBroker" persistent="true" useShutdownHook="false" monitorConnectionSplits="true" xmlns="http://activemq.apache.org/schema/core">
+    <networkConnectors>
+      <networkConnector uri="static:(tcp://localhost:61617)" name="networkConnector"/>
+    </networkConnectors>
+
+    <transportConnectors>
+      <transportConnector uri="tcp://localhost:61616"/>
+    </transportConnectors>
+
+  </broker>
+</beans>