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

ARTEMIS-482 Cleanup new ThreadPool on the testsuite to avoid leak report

This commit is contained in:
Clebert Suconic 2016-04-14 23:12:48 -04:00
parent ec73961f72
commit b7118df7d0
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/invm/InVMConnector.java
View File

@ -94,6 +94,13 @@ public class InVMConnector extends AbstractConnector {
private static ExecutorService threadPoolExecutor; private static ExecutorService threadPoolExecutor;
public static void resetThreadPool() {
if (threadPoolExecutor != null) {
threadPoolExecutor.shutdown();
threadPoolExecutor = null;
}
}
private static ExecutorService getInVMExecutor() { private static ExecutorService getInVMExecutor() {
if (threadPoolExecutor == null) { if (threadPoolExecutor == null) {
if (ActiveMQClient.globalThreadMaxPoolSize <= -1) { if (ActiveMQClient.globalThreadMaxPoolSize <= -1) {

3
artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
View File

@ -96,6 +96,7 @@ import org.apache.activemq.artemis.core.postoffice.PostOffice;
import org.apache.activemq.artemis.core.postoffice.QueueBinding; import org.apache.activemq.artemis.core.postoffice.QueueBinding;
import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding; import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector;
import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry; import org.apache.activemq.artemis.core.remoting.impl.invm.InVMRegistry;
import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants; import org.apache.activemq.artemis.core.remoting.impl.invm.TransportConstants;
@ -235,6 +236,8 @@ public abstract class ActiveMQTestBase extends Assert {
closeAllSessionFactories(); closeAllSessionFactories();
closeAllServerLocatorsFactories(); closeAllServerLocatorsFactories();
InVMConnector.resetThreadPool();
try { try {
assertAllExecutorsFinished(); assertAllExecutorsFinished();
assertAllClientConsumersAreClosed(); assertAllClientConsumersAreClosed();