Revert "WFLY-9004 Artemis leaks JGroups channels on reload"

This reverts commit 13bc1c1.
wildfly · Jul 21, 2017 · fe7be83 · fe7be83
1 parent 8894869
commit fe7be83
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 96 deletions.
diff --git a/...ng-activemq/src/main/java/org/wildfly/extension/messaging/activemq/BroadcastGroupAdd.java b/...ng-activemq/src/main/java/org/wildfly/extension/messaging/activemq/BroadcastGroupAdd.java
@@ -34,6 +34,7 @@
 
 import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory;
 import org.apache.activemq.artemis.api.core.BroadcastGroupConfiguration;
+import org.apache.activemq.artemis.api.core.ChannelBroadcastEndpointFactory;
 import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
 import org.apache.activemq.artemis.core.config.Configuration;
 import org.jboss.as.controller.AbstractAddStepHandler;
@@ -180,7 +181,7 @@ static BroadcastGroupConfiguration createBroadcastGroupConfiguration(final Strin
         final long broadcastPeriod = config.getBroadcastPeriod();
         final List<String> connectorRefs = config.getConnectorInfos();
 
-        final BroadcastEndpointFactory endpointFactory = new ClosingChannelBroadcastEndpointFactory(channel, channelName);
+        final BroadcastEndpointFactory endpointFactory = new ChannelBroadcastEndpointFactory(channel, channelName);
 
         return new BroadcastGroupConfiguration()
                 .setName(name)

diff --git a/...c/main/java/org/wildfly/extension/messaging/activemq/ClosingChannelBroadcastEndpoint.java b/...c/main/java/org/wildfly/extension/messaging/activemq/ClosingChannelBroadcastEndpoint.java
diff --git a/...java/org/wildfly/extension/messaging/activemq/ClosingChannelBroadcastEndpointFactory.java b/...java/org/wildfly/extension/messaging/activemq/ClosingChannelBroadcastEndpointFactory.java
diff --git a/...ng-activemq/src/main/java/org/wildfly/extension/messaging/activemq/DiscoveryGroupAdd.java b/...ng-activemq/src/main/java/org/wildfly/extension/messaging/activemq/DiscoveryGroupAdd.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 
 import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory;
+import org.apache.activemq.artemis.api.core.ChannelBroadcastEndpointFactory;
 import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
 import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
 import org.apache.activemq.artemis.core.config.Configuration;
@@ -152,7 +153,7 @@ static DiscoveryGroupConfiguration createDiscoveryGroupConfiguration(final Strin
         final long refreshTimeout = config.getRefreshTimeout();
         final long initialWaitTimeout = config.getDiscoveryInitialWaitTimeout();
 
-        final BroadcastEndpointFactory endpointFactory = new ClosingChannelBroadcastEndpointFactory(channel, channelName);
+        final BroadcastEndpointFactory endpointFactory = new ChannelBroadcastEndpointFactory(channel, channelName);
 
         return new DiscoveryGroupConfiguration()
                 .setName(name)