[jboss-cvs] JBoss Messaging SVN: r7714 - in trunk: src/main/org/jboss/messaging/core/management and 20 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 12 09:29:38 EDT 2009
Author: timfox
Date: 2009-08-12 09:29:37 -0400 (Wed, 12 Aug 2009)
New Revision: 7714
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
trunk/src/main/org/jboss/messaging/core/management/AcceptorControl.java
trunk/src/main/org/jboss/messaging/core/management/impl/AcceptorControlImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/server/impl/RemotingServiceImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/spi/Acceptor.java
trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageRedistributionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadFailoverSupport.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareAddressControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/JBossConnectionFactoryTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/ManualReconnectionToSingleServerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSServerControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerStartStopTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerStartStopWithReplicationTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSMessagingProxy.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
Log:
set members to null in teardown of many tests + remove acceptor pause/resume
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -20,7 +20,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Modified: trunk/src/main/org/jboss/messaging/core/management/AcceptorControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/AcceptorControl.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/src/main/org/jboss/messaging/core/management/AcceptorControl.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -32,10 +32,10 @@
*/
public interface AcceptorControl extends MessagingComponentControl
{
- void pause() throws Exception;
+// void pause() throws Exception;
+//
+// void resume() throws Exception;
- void resume() throws Exception;
-
String getName();
String getFactoryClassName();
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/AcceptorControlImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/AcceptorControlImpl.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/AcceptorControlImpl.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -83,15 +83,15 @@
acceptor.start();
}
- public void pause()
- {
- acceptor.pause();
- }
-
- public void resume()
- {
- acceptor.resume();
- }
+// public void pause()
+// {
+// acceptor.pause();
+// }
+//
+// public void resume()
+// {
+// acceptor.resume();
+// }
public void stop() throws Exception
{
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -103,9 +103,7 @@
final boolean active)
{
- this(transportConnection, -1, interceptors, active, false);
-
- log.info("Created remotingconnection " + this + " on server");
+ this(transportConnection, -1, interceptors, active, false);
}
private RemotingConnectionImpl(final Connection transportConnection,
Modified: trunk/src/main/org/jboss/messaging/core/remoting/server/impl/RemotingServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/server/impl/RemotingServiceImpl.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/src/main/org/jboss/messaging/core/remoting/server/impl/RemotingServiceImpl.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -207,7 +207,14 @@
for (Acceptor acceptor : acceptors)
{
- acceptor.pause();
+ try
+ {
+ acceptor.stop();
+ }
+ catch (Exception e)
+ {
+ log.error("Failed to stop acceptor", e);
+ }
}
}
@@ -221,7 +228,7 @@
// We need to stop them accepting first so no new connections are accepted after we send the disconnect message
for (Acceptor acceptor : acceptors)
{
- acceptor.pause();
+ acceptor.stop();
}
for (RemotingConnection connection : connections.values())
@@ -229,10 +236,10 @@
connection.getChannel(0, -1, false).sendAndFlush(new PacketImpl(DISCONNECT));
}
- for (Acceptor acceptor : acceptors)
- {
- acceptor.stop();
- }
+// for (Acceptor acceptor : acceptors)
+// {
+// acceptor.stop();
+// }
acceptors.clear();
Modified: trunk/src/main/org/jboss/messaging/core/remoting/spi/Acceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/spi/Acceptor.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/src/main/org/jboss/messaging/core/remoting/spi/Acceptor.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -33,7 +33,7 @@
*/
public interface Acceptor extends MessagingComponent
{
- void pause();
+ //void pause();
- void resume();
+ //void resume();
}
Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -83,7 +83,7 @@
private ChannelFactory channelFactory;
private volatile ChannelGroup serverChannelGroup;
-
+
private volatile ChannelGroup channelGroup;
private ServerBootstrap bootstrap;
@@ -125,9 +125,9 @@
private final HttpKeepAliveRunnable httpKeepAliveRunnable;
private ConcurrentMap<Object, Connection> connections = new ConcurrentHashMap<Object, Connection>();
-
- private boolean paused;
-
+
+ // private boolean paused;
+
private final Executor threadPool;
public NettyAcceptor(final Map<String, Object> configuration,
@@ -156,7 +156,10 @@
TransportConstants.DEFAULT_HTTP_RESPONSE_TIME,
configuration);
httpKeepAliveRunnable = new HttpKeepAliveRunnable();
- Future<?> future = scheduledThreadPool.scheduleAtFixedRate(httpKeepAliveRunnable, httpServerScanPeriod, httpServerScanPeriod, TimeUnit.MILLISECONDS);
+ Future<?> future = scheduledThreadPool.scheduleAtFixedRate(httpKeepAliveRunnable,
+ httpServerScanPeriod,
+ httpServerScanPeriod,
+ TimeUnit.MILLISECONDS);
httpKeepAliveRunnable.setFuture(future);
}
else
@@ -210,15 +213,15 @@
this.tcpReceiveBufferSize = ConfigurationHelper.getIntProperty(TransportConstants.TCP_RECEIVEBUFFER_SIZE_PROPNAME,
TransportConstants.DEFAULT_TCP_RECEIVEBUFFER_SIZE,
configuration);
-
- this.threadPool= threadPool;
+
+ this.threadPool = threadPool;
}
public synchronized void start() throws Exception
- {
+ {
if (channelFactory != null)
{
- // Already started
+ // Already started
return;
}
@@ -297,14 +300,14 @@
bootstrap.setOption("child.keepAlive", true);
channelGroup = new DefaultChannelGroup("jbm-accepted-channels");
-
+
serverChannelGroup = new DefaultChannelGroup("jbm-acceptor-channels");
startServerChannels();
-
- paused = false;
+
+ // paused = false;
}
-
+
private void startServerChannels()
{
String[] hosts = TransportConfiguration.splitHosts(host);
@@ -313,7 +316,7 @@
SocketAddress address;
if (useInvm)
{
- address = new LocalAddress(h);
+ address = new LocalAddress(h);
}
else
{
@@ -323,63 +326,60 @@
serverChannelGroup.add(serverChannel);
}
}
-
- public synchronized void pause()
- {
- if (paused)
- {
- return;
- }
-
- if (channelFactory == null)
- {
- return;
- }
- //We *pause* the acceptor so no new connections are made
-
- serverChannelGroup.close().awaitUninterruptibly();
-
- try
- {
- Thread.sleep(500);
- }
- catch (Exception e)
- {
- }
-
- paused = true;
- }
-
- public synchronized void resume()
- {
- if (!paused)
- {
- return;
- }
-
- startServerChannels();
-
- paused = false;
- }
-
+ // public synchronized void pause()
+ // {
+ // if (paused)
+ // {
+ // return;
+ // }
+ //
+ // if (channelFactory == null)
+ // {
+ // return;
+ // }
+ //
+ // //We *pause* the acceptor so no new connections are made
+ //
+ // serverChannelGroup.close().awaitUninterruptibly();
+ //
+ // try
+ // {
+ // Thread.sleep(500);
+ // }
+ // catch (Exception e)
+ // {
+ // }
+ //
+ // paused = true;
+ // }
+ //
+ // public synchronized void resume()
+ // {
+ // if (!paused)
+ // {
+ // return;
+ // }
+ //
+ // startServerChannels();
+ //
+ // paused = false;
+ // }
+
public synchronized void stop()
{
if (channelFactory == null)
{
return;
}
-
- if (!paused)
- {
- serverChannelGroup.close().awaitUninterruptibly();
- }
+ serverChannelGroup.close().awaitUninterruptibly();
+
if (httpKeepAliveRunnable != null)
{
httpKeepAliveRunnable.close();
}
-
+
ChannelGroupFuture future = channelGroup.close().awaitUninterruptibly();
if (!future.isCompleteSuccess())
@@ -397,8 +397,8 @@
}
channelFactory.releaseExternalResources();
- channelFactory = null;
-
+ channelFactory = null;
+
for (Connection connection : connections.values())
{
listener.connectionDestroyed(connection.getID());
@@ -468,14 +468,14 @@
{
if (connections.remove(connectionID) != null)
{
-// // Execute on different thread to avoid deadlocks
-// new Thread()
-// {
-// public void run()
-// {
- listener.connectionDestroyed(connectionID);
- // }
- // }.start();
+ // // Execute on different thread to avoid deadlocks
+ // new Thread()
+ // {
+ // public void run()
+ // {
+ listener.connectionDestroyed(connectionID);
+ // }
+ // }.start();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -103,10 +103,12 @@
{
checkFreePort(PORTS);
- servers = new MessagingServer[MAX_SERVERS];
+ servers = null;
- sfs = new ClientSessionFactory[MAX_SERVERS];
+ sfs = null;
+ consumers = null;
+
consumers = new ConsumerHolder[MAX_CONSUMERS];
super.tearDown();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageRedistributionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageRedistributionTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageRedistributionTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -44,15 +44,25 @@
{
super.setUp();
+ start();
+ }
+
+ private void start() throws Exception
+ {
setupServers();
- setRedistributionDelay(0);
+ setRedistributionDelay(0);
}
+
+ private void stop() throws Exception
+ {
+ stopServers();
+ }
@Override
protected void tearDown() throws Exception
{
- stopServers();
+ stop();
super.tearDown();
}
@@ -441,8 +451,8 @@
verifyNotReceive(1);
removeConsumer(1);
- tearDown();
- setUp();
+ stop();
+ start();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/SymmetricClusterTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -52,9 +52,7 @@
{
stopServers();
- super.tearDown();
-
-
+ super.tearDown();
}
protected boolean isNetty()
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -72,7 +72,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -256,9 +256,9 @@
session2.close();
- tearDown();
+ stop();
- setUp();
+ start();
}
}
@@ -267,11 +267,8 @@
// Protected -----------------------------------------------------
- @Override
- protected void setUp() throws Exception
+ private void start() throws Exception
{
- super.setUp();
-
Configuration backupConf = new ConfigurationImpl();
backupConf.setSecurityEnabled(false);
backupConf.setQueueActivationTimeout(ACTIVATION_TIMEOUT);
@@ -297,16 +294,36 @@
liveService = Messaging.newMessagingServer(liveConf, false);
liveService.start();
}
-
- @Override
- protected void tearDown() throws Exception
+
+ private void stop() throws Exception
{
backupService.stop();
liveService.stop();
-
+
assertEquals(0, InVMRegistry.instance.size());
+
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ start();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ stop();
+
+ backupService = null;
+
+ liveService = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/DiscoveryClusterWithBackupFailoverTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -52,85 +52,70 @@
@Override
public void testFailAllNodes() throws Exception
{
- for (int i = 0; i < 5; i++)
- {
- log.info("*** iteration " + i);
- tearDown();
+ startServers(3, 4, 5, 0, 1, 2);
- super.clearAllServers();
+ setupSessionFactory(0, 3, isNetty(), false);
+ setupSessionFactory(1, 4, isNetty(), false);
+ setupSessionFactory(2, 5, isNetty(), false);
- setUp();
+ createQueue(0, "queues.testaddress", "queue0", null, false);
+ createQueue(1, "queues.testaddress", "queue0", null, false);
+ createQueue(2, "queues.testaddress", "queue0", null, false);
- this.setupCluster();
+ addConsumer(0, 0, "queue0", null);
+ addConsumer(1, 1, "queue0", null);
+ addConsumer(2, 2, "queue0", null);
- startServers(3, 4, 5, 0, 1, 2);
+ waitForBindings(0, "queues.testaddress", 1, 1, true);
+ waitForBindings(1, "queues.testaddress", 1, 1, true);
+ waitForBindings(2, "queues.testaddress", 1, 1, true);
- setupSessionFactory(0, 3, isNetty(), false);
- setupSessionFactory(1, 4, isNetty(), false);
- setupSessionFactory(2, 5, isNetty(), false);
+ waitForBindings(0, "queues.testaddress", 2, 2, false);
+ waitForBindings(1, "queues.testaddress", 2, 2, false);
+ waitForBindings(2, "queues.testaddress", 2, 2, false);
- createQueue(0, "queues.testaddress", "queue0", null, false);
- createQueue(1, "queues.testaddress", "queue0", null, false);
- createQueue(2, "queues.testaddress", "queue0", null, false);
+ send(0, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- addConsumer(0, 0, "queue0", null);
- addConsumer(1, 1, "queue0", null);
- addConsumer(2, 2, "queue0", null);
+ send(1, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- waitForBindings(0, "queues.testaddress", 1, 1, true);
- waitForBindings(1, "queues.testaddress", 1, 1, true);
- waitForBindings(2, "queues.testaddress", 1, 1, true);
+ send(2, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- waitForBindings(0, "queues.testaddress", 2, 2, false);
- waitForBindings(1, "queues.testaddress", 2, 2, false);
- waitForBindings(2, "queues.testaddress", 2, 2, false);
+ failNode(0);
- send(0, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
+ send(0, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- send(1, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
+ send(1, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- send(2, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
+ send(2, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- failNode(0);
+ failNode(1);
- send(0, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
+ send(0, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- send(1, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
+ send(1, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- send(2, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
+ send(2, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- failNode(1);
+ failNode(2);
- send(0, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
+ send(0, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- send(1, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
+ send(1, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
- send(2, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-
- failNode(2);
-
- send(0, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-
- send(1, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-
- send(2, "queues.testaddress", 10, false, null);
- verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
-
- stopServers();
- }
-
+ send(2, "queues.testaddress", 10, false, null);
+ verifyReceiveRoundRobinInSomeOrder(10, 0, 1, 2);
}
@Override
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailBackupServerTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -70,7 +70,7 @@
private MessagingServer backupServer;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -80,142 +80,135 @@
public void testFailBackup() throws Exception
{
- for (int j = 0; j < 5; j++)
- {
- ClientSessionFactoryInternal sf1 = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"),
- new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
- backupParams));
+ ClientSessionFactoryInternal sf1 = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"),
+ new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory",
+ backupParams));
- sf1.setProducerWindowSize(32 * 1024);
+ sf1.setProducerWindowSize(32 * 1024);
- ClientSession session1 = sf1.createSession(false, true, true);
+ ClientSession session1 = sf1.createSession(false, true, true);
- session1.createQueue(ADDRESS, ADDRESS, null, false);
+ session1.createQueue(ADDRESS, ADDRESS, null, false);
- ClientProducer producer = session1.createProducer(ADDRESS);
+ ClientProducer producer = session1.createProducer(ADDRESS);
- final int numMessages = 1000;
+ final int numMessages = 1000;
- for (int i = 0; i < numMessages; i++)
- {
- ClientMessage message = session1.createClientMessage(JBossTextMessage.TYPE,
- false,
- 0,
- System.currentTimeMillis(),
- (byte)1);
- message.putIntProperty(new SimpleString("count"), i);
- message.getBody().writeString("aardvarks");
- producer.send(message);
- }
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message = session1.createClientMessage(JBossTextMessage.TYPE,
+ false,
+ 0,
+ System.currentTimeMillis(),
+ (byte)1);
+ message.putIntProperty(new SimpleString("count"), i);
+ message.getBody().writeString("aardvarks");
+ producer.send(message);
+ }
- ClientConsumer consumer1 = session1.createConsumer(ADDRESS);
+ ClientConsumer consumer1 = session1.createConsumer(ADDRESS);
- session1.start();
+ session1.start();
- for (int i = 0; i < numMessages; i++)
- {
- ClientMessage message = consumer1.receive(1000);
+ for (int i = 0; i < numMessages; i++)
+ {
+ ClientMessage message = consumer1.receive(1000);
- assertNotNull(message);
+ assertNotNull(message);
- assertEquals("aardvarks", message.getBody().readString());
-
- int count = (Integer)message.getProperty(new SimpleString("count"));
-
- assertEquals(i, count);
-
- if (i == 0)
- {
- // Fail the replicating connection - this simulates the backup server crashing
+ assertEquals("aardvarks", message.getBody().readString());
- liveServer.getReplicatingChannel()
- .getConnection()
- .fail(new MessagingException(MessagingException.NOT_CONNECTED, "blah"));
- }
+ int count = (Integer)message.getProperty(new SimpleString("count"));
- message.acknowledge();
- }
+ assertEquals(i, count);
- ClientMessage message = consumer1.receive(1000);
-
- assertNull(message);
-
- // Send some more
-
- for (int i = 0; i < numMessages; i++)
+ if (i == 0)
{
- message = session1.createClientMessage(JBossTextMessage.TYPE, false, 0, System.currentTimeMillis(), (byte)1);
- message.putIntProperty(new SimpleString("count"), i);
- message.getBody().writeString("aardvarks");
- producer.send(message);
+ // Fail the replicating connection - this simulates the backup server crashing
+
+ liveServer.getReplicatingChannel()
+ .getConnection()
+ .fail(new MessagingException(MessagingException.NOT_CONNECTED, "blah"));
}
- for (int i = 0; i < numMessages; i++)
- {
- message = consumer1.receive(1000);
+ message.acknowledge();
+ }
- assertNotNull(message);
+ ClientMessage message = consumer1.receive(1000);
- assertEquals("aardvarks", message.getBody().readString());
+ assertNull(message);
- assertEquals(i, message.getProperty(new SimpleString("count")));
+ // Send some more
- message.acknowledge();
- }
+ for (int i = 0; i < numMessages; i++)
+ {
+ message = session1.createClientMessage(JBossTextMessage.TYPE, false, 0, System.currentTimeMillis(), (byte)1);
+ message.putIntProperty(new SimpleString("count"), i);
+ message.getBody().writeString("aardvarks");
+ producer.send(message);
+ }
+ for (int i = 0; i < numMessages; i++)
+ {
message = consumer1.receive(1000);
- assertNull(message);
+ assertNotNull(message);
- session1.close();
+ assertEquals("aardvarks", message.getBody().readString());
- // Send some more on different session factory
+ assertEquals(i, message.getProperty(new SimpleString("count")));
- sf1.close();
+ message.acknowledge();
+ }
- sf1 = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
+ message = consumer1.receive(1000);
- sf1.setProducerWindowSize(32 * 1024);
+ assertNull(message);
- session1 = sf1.createSession(false, true, true);
+ session1.close();
- producer = session1.createProducer(ADDRESS);
+ // Send some more on different session factory
- consumer1 = session1.createConsumer(ADDRESS);
+ sf1.close();
- session1.start();
+ sf1 = new ClientSessionFactoryImpl(new TransportConfiguration("org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory"));
- for (int i = 0; i < numMessages; i++)
- {
- message = session1.createClientMessage(JBossTextMessage.TYPE, false, 0, System.currentTimeMillis(), (byte)1);
- message.putIntProperty(new SimpleString("count"), i);
- message.getBody().writeString("aardvarks");
- producer.send(message);
- }
+ sf1.setProducerWindowSize(32 * 1024);
- for (int i = 0; i < numMessages; i++)
- {
- message = consumer1.receive(1000);
+ session1 = sf1.createSession(false, true, true);
- assertNotNull(message);
+ producer = session1.createProducer(ADDRESS);
- assertEquals("aardvarks", message.getBody().readString());
+ consumer1 = session1.createConsumer(ADDRESS);
- assertEquals(i, message.getProperty(new SimpleString("count")));
+ session1.start();
- message.acknowledge();
- }
+ for (int i = 0; i < numMessages; i++)
+ {
+ message = session1.createClientMessage(JBossTextMessage.TYPE, false, 0, System.currentTimeMillis(), (byte)1);
+ message.putIntProperty(new SimpleString("count"), i);
+ message.getBody().writeString("aardvarks");
+ producer.send(message);
+ }
+ for (int i = 0; i < numMessages; i++)
+ {
message = consumer1.receive(1000);
- assertNull(message);
+ assertNotNull(message);
- session1.close();
-
- tearDown();
-
- setUp();
+ assertEquals("aardvarks", message.getBody().readString());
+
+ assertEquals(i, message.getProperty(new SimpleString("count")));
+
+ message.acknowledge();
}
+
+ message = consumer1.receive(1000);
+
+ assertNull(message);
+
+ session1.close();
}
// Package protected ---------------------------------------------
@@ -261,6 +254,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ backupServer = null;
+
+ liveServer = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -70,7 +70,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -291,6 +291,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ backupService = null;
+
+ liveService = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverManagementTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -74,7 +74,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -294,6 +294,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ backupService = null;
+
+ liveService = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverNoSessionsFailoverTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -68,7 +68,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -216,6 +216,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ backupService = null;
+
+ liveService = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -62,7 +62,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -197,6 +197,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ backupService = null;
+
+ liveService = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -70,7 +70,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -217,6 +217,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ backupService = null;
+
+ liveService = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverTestBase.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -60,7 +60,7 @@
// Attributes ----------------------------------------------------
- protected final Map<String, Object> backupParams = new HashMap<String, Object>();
+ protected Map<String, Object> backupParams = new HashMap<String, Object>();
protected MessagingServer liveServer;
@@ -281,6 +281,12 @@
protected void tearDown() throws Exception
{
stopServers();
+
+ backupServer = null;
+
+ liveServer = null;
+
+ backupParams = null;
super.tearDown();
}
@@ -289,20 +295,19 @@
{
if (backupServer != null && backupServer.isStarted())
{
- backupServer.stop();
-
- backupServer = null;
+ backupServer.stop();
}
if (liveServer != null && liveServer.isStarted())
{
- liveServer.stop();
-
- liveServer = null;
-
+ liveServer.stop();
}
assertEquals(0, InVMRegistry.instance.size());
+
+ backupServer = null;
+
+ liveServer = null;
}
// Private -------------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -71,7 +71,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -513,6 +513,12 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ backupService = null;
+
+ liveService = null;
+
+ backupParams = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -109,6 +109,8 @@
assertEquals(0, InVMRegistry.instance.size());
+ service = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadFailoverSupport.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadFailoverSupport.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadFailoverSupport.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -84,6 +84,7 @@
protected void tearDown() throws Exception
{
timer.cancel();
+ timer = null;
super.tearDown();
}
@@ -91,9 +92,7 @@
{
return true;
}
-
-
-
+
protected void runMultipleThreadsFailoverTest(final RunnableT runnable,
final int numThreads,
final int numIts,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/MultiThreadRandomFailoverTestBase.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -74,7 +74,7 @@
protected MessagingServer backupServer;
- protected final Map<String, Object> backupParams = new HashMap<String, Object>();
+ protected Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -1317,6 +1317,12 @@
}
backupServer = null;
+ liveServer = null;
+
+ backupServer = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -528,8 +528,6 @@
compareQueues(ADDRESS, PROPERTY_KEY, NTHREADS * NMESSAGES);
stopServers();
- // ClientProducer p = s
-
}
public void testDeliveryOrderOnRedeliveryMultiThread() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -95,7 +95,7 @@
protected MessagingServer backupServer;
- protected final Map<String, Object> backupParams = new HashMap<String, Object>();
+ protected Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -111,7 +111,6 @@
// Currently disabled - https://jira.jboss.org/jira/browse/JBMESSAGING-1558
public void disabled_testB() throws Exception
{
-
runMultipleThreadsFailoverTest(new RunnableT()
{
@Override
@@ -252,7 +251,10 @@
liveServer.stop();
assertEquals(0, InVMRegistry.instance.size());
-
+
+ backupServer = null;
+
+ liveServer = null;
}
private void sendMessages(final ClientSession sessSend,
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/RandomFailoverTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -63,7 +63,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
private Timer timer;
@@ -1463,6 +1463,10 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ backupService = null;
+
+ liveService = null;
}
// Inner classes -------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -712,6 +712,8 @@
service.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ service = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -70,7 +70,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -307,6 +307,12 @@
liveService.stop();
assertEquals(0, InVMRegistry.instance.size());
+
+ backupService = null;
+
+ liveService = null;
+
+ backupParams = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -65,7 +65,7 @@
private MessagingServer backupServer;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -174,6 +174,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ backupServer = null;
+
+ liveServer = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -199,6 +199,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ server1Service = null;
+
+ server0Service = null;
+
+ server1Params = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/SplitBrainTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -76,7 +76,7 @@
private MessagingServer backupServer;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -245,6 +245,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ backupServer = null;
+
+ liveServer = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/XAMultiThreadRandomFailoverTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -61,7 +61,7 @@
protected MessagingServer backupService;
- protected final Map<String, Object> backupParams = new HashMap<String, Object>();
+ protected Map<String, Object> backupParams = new HashMap<String, Object>();
protected Map<ClientSession, Xid> xids;
@@ -631,6 +631,10 @@
backupService.stop();
liveService.stop();
+
+ backupService = null;
+
+ liveService = null;
assertEquals(0, InVMRegistry.instance.size());
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareAddressControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareAddressControlWrapperTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareAddressControlWrapperTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -22,20 +22,19 @@
package org.jboss.messaging.tests.integration.cluster.management;
+import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createAddressControl;
+import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
+import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
+import static org.jboss.messaging.tests.util.RandomUtil.randomString;
+
import org.jboss.messaging.core.client.ClientSession;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
import org.jboss.messaging.core.client.impl.ClientSessionFactoryInternal;
import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.management.AddressControl;
import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
-import static org.jboss.messaging.tests.integration.management.ManagementControlHelper.createAddressControl;
-import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
-import static org.jboss.messaging.tests.util.RandomUtil.randomSimpleString;
-import static org.jboss.messaging.tests.util.RandomUtil.randomString;
import org.jboss.messaging.utils.SimpleString;
-import javax.management.openmbean.TabularData;
-
/**
* A ReplicationAwareQueueControlWrapperTest
*
@@ -117,6 +116,9 @@
{
session.deleteQueue(address);
session.close();
+
+ address = null;
+ session = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareMessagingServerControlWrapperTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -233,6 +233,10 @@
protected void tearDown() throws Exception
{
session.close();
+
+ session = null;
+
+ address = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -459,6 +459,10 @@
protected void tearDown() throws Exception
{
session.close();
+
+ session = null;
+
+ address = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -54,7 +54,7 @@
protected MessagingServer backupServer;
- protected final Map<String, Object> backupParams = new HashMap<String, Object>();
+ protected Map<String, Object> backupParams = new HashMap<String, Object>();
protected MBeanServer liveMBeanServer;
@@ -146,6 +146,16 @@
backupServer.stop();
liveServer.stop();
+
+ backupServer = null;
+
+ liveServer = null;
+
+ backupParams = null;
+
+ liveMBeanServer = null;
+
+ backupMBeanServer = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/http/NettyHttpTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -83,6 +83,10 @@
threadPool.shutdownNow();
scheduledThreadPool.shutdownNow();
+
+ threadPool = null;
+
+ scheduledThreadPool = null;
checkFreePort(TransportConstants.DEFAULT_PORT);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/JBossConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/JBossConnectionFactoryTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/JBossConnectionFactoryTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -853,6 +853,14 @@
protected void tearDown() throws Exception
{
stopLiveAndBackup();
+
+ this.liveService = null;
+
+ this.backupService = null;
+
+ this.liveTC = null;
+
+ this.backupTC = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/ManualReconnectionToSingleServerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -211,6 +211,12 @@
protected void tearDown() throws Exception
{
server.stop();
+
+ server = null;
+
+ serverManager = null;
+
+ connection = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/bridge/BridgeTestBase.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -174,6 +174,13 @@
server1.stop();
server0.stop();
+
+ server1 = null;
+ server0 = null;
+ jmsServer0 = null;
+ jmsServer1 = null;
+ context0 = context1 = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/JMSFailoverTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -77,7 +77,7 @@
private MessagingServer backupService;
- private final Map<String, Object> backupParams = new HashMap<String, Object>();
+ private Map<String, Object> backupParams = new HashMap<String, Object>();
// Static --------------------------------------------------------
@@ -277,6 +277,12 @@
assertEquals(0, InVMRegistry.instance.size());
+ liveService = null;
+
+ backupService = null;
+
+ backupParams = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -345,6 +345,22 @@
protected void tearDown() throws Exception
{
session.close();
+
+ liveServerManager = null;
+
+ backupServerManager = null;
+
+ liveQueueControl = null;
+
+ backupQueueControl = null;
+
+ liveOtherQueueControl = null;
+
+ backupOtherQueueControl = null;
+
+ session = null;
+
+ queue = otherQueue = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSServerControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSServerControlWrapperTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSServerControlWrapperTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -49,7 +49,6 @@
private static final Logger log = Logger.getLogger(ReplicationAwareJMSServerControlWrapperTest.class);
-
// Attributes ----------------------------------------------------
private JMSServerManagerImpl liveServerManager;
@@ -73,44 +72,43 @@
}
// Public --------------------------------------------------------
-
public void testCreateAndDestroyQueue() throws Exception
{
-
+
String name = randomString();
String binding = randomString();
ObjectName queueON = ObjectNames.getJMSQueueObjectName(name);
-
+
checkNoResource(queueON, liveMBeanServer);
checkNoResource(queueON, backupMBeanServer);
-
- liveServerControl.createQueue(name , binding);
+ liveServerControl.createQueue(name, binding);
+
checkResource(queueON, liveMBeanServer);
checkResource(queueON, backupMBeanServer);
-
+
liveServerControl.destroyQueue(name);
checkNoResource(queueON, liveMBeanServer);
checkNoResource(queueON, backupMBeanServer);
}
-
+
public void testCreateAndDestroyTopic() throws Exception
{
-
+
String name = randomString();
String binding = randomString();
ObjectName topicON = ObjectNames.getJMSTopicObjectName(name);
-
+
checkNoResource(topicON, liveMBeanServer);
checkNoResource(topicON, backupMBeanServer);
-
- liveServerControl.createTopic(name , binding);
+ liveServerControl.createTopic(name, binding);
+
checkResource(topicON, liveMBeanServer);
checkResource(topicON, backupMBeanServer);
-
+
liveServerControl.destroyTopic(name);
checkNoResource(topicON, liveMBeanServer);
@@ -127,7 +125,7 @@
assertEquals(1, liveServerControl.listRemoteAddresses().length);
assertEquals(1, backupServerControl.listRemoteAddresses().length);
-
+
connection.close();
assertEquals(0, liveServerControl.listRemoteAddresses().length);
@@ -137,7 +135,7 @@
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
-
+
@Override
protected void setUp() throws Exception
{
@@ -146,13 +144,13 @@
backupServerManager = new JMSServerManagerImpl(backupServer);
backupServerManager.setContext(new NullInitialContext());
backupServerManager.start();
-
+
liveServerManager = new JMSServerManagerImpl(liveServer);
liveServerManager.setContext(new NullInitialContext());
liveServerManager.start();
-
+
liveServerControl = ManagementControlHelper.createJMSServerControl(liveMBeanServer);
- backupServerControl = ManagementControlHelper.createJMSServerControl(backupMBeanServer);
+ backupServerControl = ManagementControlHelper.createJMSServerControl(backupMBeanServer);
}
@Override
@@ -160,7 +158,15 @@
{
backupServerManager.stop();
liveServerManager.stop();
-
+
+ liveServerManager = null;
+
+ backupServerManager = null;
+
+ liveServerControl = null;
+
+ backupServerControl = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -96,6 +96,10 @@
}
+ server = null;
+ jmsServer = null;
+ cf = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -92,9 +92,13 @@
e.printStackTrace();
}
server = null;
-
}
+ server = null;
+ jmsServer = null;
+ cf = null;
+ jBossQueue = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerDeployerTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -263,6 +263,10 @@
protected void tearDown() throws Exception
{
jmsServer.stop();
+ jmsServer = null;
+ context = null;
+ deploymentManager = null;
+ config = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerStartStopTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerStartStopTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerStartStopTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -148,6 +148,7 @@
@Override
protected void tearDown() throws Exception
{
+ liveJMSServer = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerStartStopWithReplicationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerStartStopWithReplicationTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/JMSServerStartStopWithReplicationTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -98,6 +98,9 @@
@Override
protected void tearDown() throws Exception
{
+ this.liveJMSServer = null;
+ this.backupJMSServer = null;
+
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSMessagingProxy.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSMessagingProxy.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSMessagingProxy.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -22,8 +22,6 @@
package org.jboss.messaging.tests.integration.jms.server.management;
-import java.util.Map;
-
import javax.jms.Message;
import javax.jms.Queue;
import javax.jms.QueueRequestor;
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControl2Test.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -29,6 +29,7 @@
import java.util.concurrent.TimeUnit;
import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
@@ -167,12 +168,14 @@
assertEquals(0, control.listConnectionIDs().length);
- Connection connection = JMSUtil.createConnection(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ ConnectionFactory cf1 = JMSUtil.createFactory(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ Connection connection = cf1.createConnection();
String[] connectionIDs = control.listConnectionIDs();
assertEquals(1, connectionIDs.length);
-
- Connection connection2 = JMSUtil.createConnection(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+
+ ConnectionFactory cf2 = JMSUtil.createFactory(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ Connection connection2 = cf2.createConnection();
assertEquals(2, control.listConnectionIDs().length);
connection.close();
@@ -208,7 +211,8 @@
assertEquals(0, control.listConnectionIDs().length);
- Connection connection = JMSUtil.createConnection(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ ConnectionFactory cf = JMSUtil.createFactory(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ Connection connection = cf.createConnection();
String[] connectionIDs = control.listConnectionIDs();
assertEquals(1, connectionIDs.length);
@@ -246,7 +250,8 @@
assertEquals(0, control.listRemoteAddresses().length);
- Connection connection = JMSUtil.createConnection(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ ConnectionFactory cf = JMSUtil.createFactory(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ Connection connection = cf.createConnection();
String[] remoteAddresses = control.listRemoteAddresses();
assertEquals(1, remoteAddresses.length);
@@ -284,7 +289,8 @@
assertEquals(0, server.getConnectionCount());
assertEquals(0, control.listRemoteAddresses().length);
- Connection connection = JMSUtil.createConnection(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ ConnectionFactory cf = JMSUtil.createFactory(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ Connection connection = cf.createConnection();
assertEquals(1, server.getConnectionCount());
@@ -309,6 +315,8 @@
remoteAddresses = control.listRemoteAddresses();
assertEquals("got " + Arrays.asList(remoteAddresses), 0, remoteAddresses.length);
assertEquals(0, server.getConnectionCount());
+
+ connection.close();
}
finally
{
@@ -334,7 +342,8 @@
assertEquals(0, server.getConnectionCount());
assertEquals(0, control.listRemoteAddresses().length);
- Connection connection = JMSUtil.createConnection(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ ConnectionFactory cf = JMSUtil.createFactory(connectorFactory, CONNECTION_TTL, PING_PERIOD);
+ Connection connection = cf.createConnection();
assertEquals(1, server.getConnectionCount());
String[] remoteAddresses = control.listRemoteAddresses();
@@ -356,6 +365,8 @@
assertEquals(1, control.listRemoteAddresses().length);
assertEquals(1, server.getConnectionCount());
+
+ connection.close();
}
finally
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSUtil.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -70,7 +70,7 @@
return cf.createConnection();
}
- public static Connection createConnection(String connectorFactory, long connectionTTL, long clientFailureCheckPeriod) throws JMSException
+ public static ConnectionFactory createFactory(String connectorFactory, long connectionTTL, long clientFailureCheckPeriod) throws JMSException
{
JBossConnectionFactory cf = new JBossConnectionFactory(new TransportConfiguration(connectorFactory));
@@ -80,9 +80,9 @@
cf.setConnectionTTL(connectionTTL);
cf.setClientFailureCheckPeriod(clientFailureCheckPeriod);
- return cf.createConnection();
+ return cf;
}
-
+
static MessageConsumer createConsumer(Connection connection, Destination destination, String connectorFactory) throws JMSException
{
Session s = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AcceptorControlTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -107,50 +107,7 @@
assertNotNull(session);
session.close();
- acceptorControl.pause();
-
- try
- {
- ClientSession session2 = sf.createSession(false, true, true);
-
- fail("acceptor must not accept connections when paused");
- }
- catch (Exception e)
- {
- }
-
- //Pausing a second time should do nothing
-
- acceptorControl.pause();
- assertTrue(acceptorControl.isStarted());
-
- try
- {
- ClientSession session2 = sf.createSession(false, true, true);
-
- fail("acceptor must not accept connections when paused");
- }
- catch (Exception e)
- {
- }
-
- acceptorControl.resume();
- assertTrue(acceptorControl.isStarted());
-
- ClientSession session2 = sf.createSession(false, true, true);
- assertNotNull(session2);
- session2.close();
-
- //resuming again should do nothing
-
- acceptorControl.resume();
- assertTrue(acceptorControl.isStarted());
-
- session2 = sf.createSession(false, true, true);
- assertNotNull(session2);
- session2.close();
-
-
+
acceptorControl.stop();
assertFalse(acceptorControl.isStarted());
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -79,6 +79,7 @@
protected void tearDown() throws Exception
{
server.stop();
+ server = null;
super.tearDown();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2009-08-12 12:20:34 UTC (rev 7713)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2009-08-12 13:29:37 UTC (rev 7714)
@@ -100,56 +100,9 @@
acceptor.start();
assertTrue(acceptor.isStarted());
- acceptor.pause();
acceptor.stop();
assertFalse(acceptor.isStarted());
checkFreePort(TransportConstants.DEFAULT_PORT);
}
-
- public void testPauseResume() throws Exception
- {
- BufferHandler handler = new AbstractBufferHandler()
- {
-
- public void bufferReceived(Object connectionID, MessagingBuffer buffer)
- {
- }
- };
-
- Map<String, Object> params = new HashMap<String, Object>();
- ConnectionLifeCycleListener listener = new ConnectionLifeCycleListener()
- {
-
- public void connectionException(Object connectionID, MessagingException me)
- {
- }
-
- public void connectionDestroyed(Object connectionID)
- {
- }
-
- public void connectionCreated(Connection connection)
- {
- }
- };
- NettyAcceptor acceptor = new NettyAcceptor(params, handler, listener,
- Executors.newCachedThreadPool(),
- Executors.newScheduledThreadPool(ConfigurationImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE));
-
- acceptor.start();
- assertTrue(acceptor.isStarted());
-
- acceptor.pause();
- acceptor.stop();
- assertFalse(acceptor.isStarted());
- checkFreePort(TransportConstants.DEFAULT_PORT);
-
- acceptor.start();
- assertTrue(acceptor.isStarted());
- acceptor.pause();
- acceptor.resume();
- acceptor.stop();
- assertFalse(acceptor.isStarted());
- checkFreePort(TransportConstants.DEFAULT_PORT);
- }
+
}
More information about the jboss-cvs-commits
mailing list