[jboss-cvs] JBoss Messaging SVN: r5792 - in trunk: src/main/org/jboss/messaging/core/client/impl and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 3 04:07:23 EST 2009
Author: timfox
Date: 2009-02-03 04:07:23 -0500 (Tue, 03 Feb 2009)
New Revision: 5792
Modified:
trunk/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java
trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
Log:
Tweaks to tests
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java 2009-02-03 08:35:50 UTC (rev 5791)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientSessionFactory.java 2009-02-03 09:07:23 UTC (rev 5792)
@@ -93,9 +93,5 @@
int getMaxConnections();
- // TransportConfiguration getTransportConfiguration();
- //
- // TransportConfiguration getBackupTransportConfiguration();
-
void close();
}
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java 2009-02-03 08:35:50 UTC (rev 5791)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ConnectionManagerImpl.java 2009-02-03 09:07:23 UTC (rev 5792)
@@ -200,7 +200,7 @@
}
public void connectionException(final Object connectionID, final MessagingException me)
- {
+ {
failConnection(me);
}
@@ -407,7 +407,7 @@
// can't failover anyway
return true;
}
-
+
return !failover();
}
Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2009-02-03 08:35:50 UTC (rev 5791)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/RemotingConnectionImpl.java 2009-02-03 09:07:23 UTC (rev 5792)
@@ -306,7 +306,7 @@
final boolean active,
final boolean client)
- {
+ {
this.transportConnection = transportConnection;
this.blockingCallTimeout = blockingCallTimeout;
@@ -441,7 +441,7 @@
destroyed = true;
}
- log.warn(me.getMessage());
+ log.warn("Connection failed " + System.identityHashCode(this) + " " + me.getMessage());
// Then call the listeners
callListeners(me);
Modified: trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java 2009-02-03 08:35:50 UTC (rev 5791)
+++ trunk/src/main/org/jboss/messaging/core/server/cluster/impl/BridgeImpl.java 2009-02-03 09:07:23 UTC (rev 5792)
@@ -361,6 +361,8 @@
{
log.warn("Timed out waiting for batch to be sent");
}
+
+ session.close();
csf.close();
}
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-02-03 08:35:50 UTC (rev 5791)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/ClusterTestBase.java 2009-02-03 09:07:23 UTC (rev 5792)
@@ -86,7 +86,22 @@
private static final int MAX_CONSUMERS = 100;
- private ClientConsumer[] consumers = new ClientConsumer[MAX_CONSUMERS];
+
+ private static class ConsumerHolder
+ {
+ final ClientConsumer consumer;
+
+ final ClientSession session;
+
+ ConsumerHolder(final ClientConsumer consumer, final ClientSession session)
+ {
+ this.consumer = consumer;
+
+ this.session = session;
+ }
+ }
+
+ private ConsumerHolder[] consumers = new ConsumerHolder[MAX_CONSUMERS];
private static final SimpleString COUNT_PROP = new SimpleString("count_prop");
@@ -189,6 +204,8 @@
session.close();
}
+
+
protected void addConsumer(int consumerID, int node, String queueName, String filterVal) throws Exception
{
@@ -217,20 +234,54 @@
session.start();
- consumers[consumerID] = consumer;
+ consumers[consumerID] = new ConsumerHolder(consumer, session);
}
protected void removeConsumer(int consumerID) throws Exception
{
- ClientConsumer consumer = consumers[consumerID];
+ ConsumerHolder holder = consumers[consumerID];
- if (consumer == null)
+ if (holder == null)
{
throw new IllegalArgumentException("No consumer at " + consumerID);
}
- consumer.close();
+ holder.consumer.close();
+ holder.session.close();
+
+ consumers[consumerID] = null;
}
+
+ protected void closeAllConsumers() throws Exception
+ {
+ for (int i = 0; i < consumers.length; i++)
+ {
+ ConsumerHolder holder = consumers[i];
+
+ if (holder != null)
+ {
+ holder.consumer.close();
+ holder.session.close();
+
+ consumers[i] = null;
+ }
+ }
+ }
+
+ protected void closeAllSessionFactories() throws Exception
+ {
+ for (int i = 0; i < sfs.length; i++)
+ {
+ ClientSessionFactory sf = sfs[i];
+
+ if (sf != null)
+ {
+ sf.close();
+
+ sfs[i] = null;
+ }
+ }
+ }
protected void send(int node, String address, int numMessages, boolean durable, String filterVal) throws Exception
{
@@ -266,16 +317,16 @@
{
for (int i = 0; i < consumerIDs.length; i++)
{
- ClientConsumer consumer = consumers[consumerIDs[i]];
+ ConsumerHolder holder = consumers[consumerIDs[i]];
- if (consumer == null)
+ if (holder == null)
{
throw new IllegalArgumentException("No consumer at " + consumerIDs[i]);
}
for (int j = 0; j < numMessages; j++)
{
- ClientMessage message = consumer.receive(500);
+ ClientMessage message = holder.consumer.receive(500);
assertNotNull("consumer " + consumerIDs[i] + " did not receive message " + j, message);
@@ -290,14 +341,14 @@
for (int i = 0; i < numMessages; i++)
{
- ClientConsumer consumer = consumers[consumerIDs[count]];
+ ConsumerHolder holder = consumers[consumerIDs[count]];
- if (consumer == null)
+ if (holder == null)
{
throw new IllegalArgumentException("No consumer at " + consumerIDs[i]);
}
- ClientMessage message = consumer.receive(500);
+ ClientMessage message = holder.consumer.receive(500);
assertNotNull("consumer " + consumerIDs[count] + " did not receive message " + i, message);
@@ -316,14 +367,14 @@
{
for (int i = 0; i < consumerIDs.length; i++)
{
- ClientConsumer consumer = consumers[consumerIDs[i]];
+ ConsumerHolder holder = consumers[consumerIDs[i]];
- if (consumer == null)
+ if (holder == null)
{
throw new IllegalArgumentException("No consumer at " + consumerIDs[i]);
}
- assertNull("consumer " + i + " received message", consumer.receive(200));
+ assertNull("consumer " + i + " received message", holder.consumer.receive(200));
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java 2009-02-03 08:35:50 UTC (rev 5791)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/NettyOneWayTwoNodeClusterTest.java 2009-02-03 09:07:23 UTC (rev 5792)
@@ -41,7 +41,7 @@
protected boolean isFileStorage()
{
- return true;
+ return false;
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java 2009-02-03 08:35:50 UTC (rev 5791)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/OnewayTwoNodeClusterTest.java 2009-02-03 09:07:23 UTC (rev 5792)
@@ -50,6 +50,10 @@
@Override
protected void tearDown() throws Exception
{
+ closeAllConsumers();
+
+ closeAllSessionFactories();
+
stopServers(0, 1);
super.tearDown();
More information about the jboss-cvs-commits
mailing list