Repository: activemq-artemis Updated Branches: refs/heads/master fa2c5adda -> e775b3ee2
ARTEMIS-1988 Do not clear Activate Callbacks on stop This is reverting 36fc14a30d6f1128c525c91cc9f8752fdd3f540c Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/66ba1784 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/66ba1784 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/66ba1784 Branch: refs/heads/master Commit: 66ba17846fbdafa6716f73386c2562ec776b144d Parents: fa2c5ad Author: Martyn Taylor <mtay...@redhat.com> Authored: Wed Jul 25 14:44:09 2018 +0100 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Wed Jul 25 09:49:44 2018 -0400 ---------------------------------------------------------------------- .../core/server/impl/ActiveMQServerImpl.java | 5 +-- .../server/ClearActivateCallbackTest.java | 46 -------------------- 2 files changed, 2 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66ba1784/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java index 4a4ebb6..fb7fbcc 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java @@ -1110,8 +1110,6 @@ public class ActiveMQServerImpl implements ActiveMQServer { sessions.clear(); - activateCallbacks.clear(); - state = SERVER_STATE.STOPPED; activationLatch.setCount(1); @@ -3187,4 +3185,5 @@ public class ActiveMQServerImpl implements ActiveMQServer { public List<ActiveMQComponent> getExternalComponents() { return externalComponents; } -} \ No newline at end of file + +} http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66ba1784/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ClearActivateCallbackTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ClearActivateCallbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ClearActivateCallbackTest.java deleted file mode 100644 index 273f21e..0000000 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ClearActivateCallbackTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.artemis.tests.integration.server; - -import org.apache.activemq.artemis.core.server.ActivateCallback; -import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; -import org.junit.Test; - -/** - * A simple test-case used for documentation purposes. - */ -public class ClearActivateCallbackTest extends ActiveMQTestBase { - - protected ActiveMQServer server; - - @Test - public void simpleTest() throws Exception { - server = createServer(false, createDefaultNettyConfig()); - server.start(); - int initialCallbackCount = ((ActiveMQServerImpl) server).getActivateCallbacks().size(); - server.registerActivateCallback(new ActivateCallback() { - }); - assertEquals(1, ((ActiveMQServerImpl) server).getActivateCallbacks().size() - initialCallbackCount); - server.stop(); - assertEquals(0, ((ActiveMQServerImpl) server).getActivateCallbacks().size()); - server.start(); - assertEquals(initialCallbackCount, ((ActiveMQServerImpl) server).getActivateCallbacks().size()); - } -}
