Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-1704 clear activate callbacks when stopping

This commit is contained in:
Justin Bertram 2018-02-26 15:22:54 -06:00 committed by Clebert Suconic
parent 40e8daf819
commit 36fc14a30d
2 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View File

@ -1095,6 +1095,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
sessions.clear();
activateCallbacks.clear();
state = SERVER_STATE.STOPPED;
activationLatch.setCount(1);
@ -3113,4 +3115,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
public Set<ActivateCallback> getActivateCallbacks() {
return activateCallbacks;
}
}

46
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ClearActivateCallbackTest.java Normal file
View File

@ -0,0 +1,46 @@
/*
* 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());
}
}