[jboss-cvs] JBoss Messaging SVN: r7740 - in trunk: src/main/org/jboss/messaging/core/client/impl and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Aug 16 05:34:47 EDT 2009
Author: timfox
Date: 2009-08-16 05:34:46 -0400 (Sun, 16 Aug 2009)
New Revision: 7740
Modified:
trunk/build-messaging.xml
trunk/src/main/org/jboss/messaging/core/client/impl/DelegatingSession.java
trunk/src/main/org/jboss/messaging/core/management/ReplicationOperationInvoker.java
trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/CommitRollbackTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/DeadLetterAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/DeliveryOrderTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/HeuristicXATest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageRateTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/ProducerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeReconnectTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java
Log:
Fixed some tests which don't close sessions/connections
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/build-messaging.xml 2009-08-16 09:34:46 UTC (rev 7740)
@@ -1136,7 +1136,7 @@
failureproperty="tests.failed">
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
<fileset dir="${test.classes.dir}">
- <exclude name="**/integration/http/*" />
+ <!-- <exclude name="**/integration/http/*" /> -->
<include name="${tests.param}"/>
</fileset>
</batchtest>
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/DelegatingSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/DelegatingSession.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/DelegatingSession.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -65,9 +65,9 @@
{
if (!session.isClosed())
{
- log.warn("I'm closing a ClientSession you left open. Please make sure you close all ClientSessions explicitly " + "before letting them go out of scope!");
+ log.warn("I'm closing a core ClientSession you left open. Please make sure you close all ClientSessions explicitly " + "before letting them go out of scope!");
- log.warn("The session you didn't close was created here:", creationStack);
+ log.warn("The ClientSession you didn't close was created here:", creationStack);
close();
}
Modified: trunk/src/main/org/jboss/messaging/core/management/ReplicationOperationInvoker.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/ReplicationOperationInvoker.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/src/main/org/jboss/messaging/core/management/ReplicationOperationInvoker.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -32,5 +32,5 @@
{
Object invoke(String resourceName, String operationName, Object... parameters) throws Exception;
- void stop();
+ void stop() throws Exception;
}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -611,6 +611,8 @@
messageCounterManager.clear();
registeredNames.clear();
+
+ replicationInvoker.stop();
started = false;
}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -125,19 +125,11 @@
}
}
- public void stop()
+ public void stop() throws Exception
{
- if (requestor != null && !clientSession.isClosed())
+ if (clientSession != null)
{
- try
- {
- requestor.close();
- }
- catch (Exception e)
- {
- // this will happen if the remoting server is stopped before this method is called
- log.warn("Got Exception while closing requestor", e);
- }
+ clientSession.close();
}
}
// Package protected ---------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -122,6 +122,8 @@
private final int transactionBatchSize;
private ClientSession initialSession;
+
+ private final Exception creationStack;
// Constructors ---------------------------------------------------------------------------------
@@ -150,6 +152,8 @@
this.dupsOKBatchSize = dupsOKBatchSize;
this.transactionBatchSize = transactionBatchSize;
+
+ this.creationStack = new Exception();
}
// Connection implementation --------------------------------------------------------------------
@@ -436,9 +440,11 @@
{
if (!closed)
{
- log.warn("I'm closing a connection you left open. Please make sure you close all connections explicitly " +
+ log.warn("I'm closing a JMS connection you left open. Please make sure you close all JMS connections explicitly " +
"before letting them go out of scope!");
+ log.warn("The JMS connection you didn't close was created here:", creationStack);
+
close();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/CommitRollbackTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/CommitRollbackTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/CommitRollbackTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -81,6 +81,7 @@
session.commit();
assertEquals(0, q.getDeliveringCount());
session.close();
+ sendSession.close();
}
finally
{
@@ -179,6 +180,7 @@
assertEquals(0, q2.getDeliveringCount());
assertEquals(numMessages, q.getMessageCount());
sendSession.close();
+ session.close();
}
finally
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ConsumerTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -283,6 +283,7 @@
});
sessionRec.start();
assertTrue(latch.await(5, TimeUnit.SECONDS));
+ sessionRec.close();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/DeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/DeadLetterAddressTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/DeadLetterAddressTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -232,6 +232,8 @@
assertEquals(origId, origMessageId);
}
+
+ sendSession.close();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/DeliveryOrderTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/DeliveryOrderTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/DeliveryOrderTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -81,6 +81,7 @@
assertNotNull(cm);
assertEquals(i, cm.getBody().readInt());
}
+ sendSession.close();
}
finally
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ExpiryAddressTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -213,6 +213,8 @@
Long actualExpiryTime = (Long)tm.getProperty(HDR_ACTUAL_EXPIRY_TIME);
assertTrue(actualExpiryTime >= expiration);
}
+
+ sendSession.close();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/HeuristicXATest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/HeuristicXATest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/HeuristicXATest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -182,7 +182,7 @@
finally
{
if (server.isStarted())
- {
+ {
server.stop();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -314,6 +314,7 @@
consumer2.close();
consumer = this.clientSession.createConsumer(qName);
assertNull(consumer.receive(500));
+ clientSession.close();
}
public void testMultipleGroupingTXRollback() throws Exception
@@ -438,6 +439,7 @@
consumer2.close();
consumer = this.clientSession.createConsumer(qName);
assertNull(consumer.receive(500));
+ clientSession.close();
}
public void testMultipleGroupingXARollback() throws Exception
@@ -514,6 +516,7 @@
}
consumer = this.clientSession.createConsumer(qName);
assertNull(consumer.receive(500));
+ clientSession.close();
}
protected void tearDown() throws Exception
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageRateTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageRateTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageRateTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -82,7 +82,7 @@
assertTrue("TotalTime = " + (end - start), end - start >= 1000);
-
+ session.close();
}
finally
{
@@ -133,7 +133,7 @@
assertTrue("TotalTime = " + (end - start), end - start >= 1000);
-
+ session.close();
}
finally
{
@@ -202,7 +202,7 @@
assertTrue("TotalTime = " + (end - start), end - start >= 1000);
-
+ session.close();
}
finally
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -669,6 +669,8 @@
producer.send(message);
}
+
+ session.close();
session = sf.createSession(null, null, false, true, true, false, 0);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/ProducerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/ProducerTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/ProducerTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -92,6 +92,7 @@
message.getBody().writeBytes(body);
producer.send(message);
assertTrue(latch.await(5, TimeUnit.SECONDS));
+ session.close();
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -216,9 +216,10 @@
if (!strictUpdate)
{
// If non Strict, at least rollback/cancel should still update the delivery-counts
- session.rollback(true);
- session.close();
+ session.rollback(true);
}
+
+ session.close();
server.stop();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -65,8 +65,10 @@
}
});
+ clientSession.close();
server.stop();
assertTrue(latch.await(5, TimeUnit.SECONDS));
+
}
finally
{
@@ -99,6 +101,7 @@
clientSession.addFailureListener(listener);
assertTrue(clientSession.removeFailureListener(listener));
+ clientSession.close();
server.stop();
assertFalse(listener.called);
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/TemporaryQueueTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -208,6 +208,8 @@
latch.await(2 * CONNECTION_TTL, TimeUnit.MILLISECONDS);
assertEquals(0, server.getConnectionCount());
+
+ session.close();
sf.close();
sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName()));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeReconnectTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-08-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -658,6 +658,7 @@
}
session0.close();
+ session1.close();
server0.stop();
server1.stop();
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-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -232,10 +232,14 @@
List<MyListener> listeners = new ArrayList<MyListener>();
RemotingConnection conn = null;
+
+ Set<ClientSession> sessions = new HashSet<ClientSession>();
for (int i = 0; i < numSessions; i++)
{
ClientSession session = sf.createSession(false, true, true);
+
+ sessions.add(session);
if (conn == null)
{
@@ -255,6 +259,11 @@
{
assertEquals(1, listener.getFailCount());
}
+
+ for (ClientSession session : sessions)
+ {
+ session.close();
+ }
sf.close();
}
@@ -281,10 +290,14 @@
List<MyListener> listeners = new ArrayList<MyListener>();
RemotingConnection conn = null;
+
+ Set<ClientSession> sessions = new HashSet<ClientSession>();
for (int i = 0; i < numSessions; i++)
{
ClientSession session = sf.createSession(false, true, true);
+
+ sessions.add(session);
if (conn == null)
{
@@ -307,6 +320,11 @@
{
assertEquals(1, listener.getFailCount());
}
+
+ for (ClientSession session : sessions)
+ {
+ session.close();
+ }
sf.close();
}
@@ -412,6 +430,11 @@
}
csession.close();
+
+ for (ClientSession session : sessions)
+ {
+ session.close();
+ }
sf.close();
}
@@ -442,9 +465,13 @@
RemotingConnection conn = null;
+ Set<ClientSession> sessions = new HashSet<ClientSession>();
+
for (int i = 0; i < numSessions; i++)
{
ClientSession session = sf.createSession(false, true, true);
+
+ sessions.add(session);
if (conn == null)
{
@@ -466,6 +493,11 @@
{
assertEquals(1, listener.getFailCount());
}
+
+ for (ClientSession session: sessions)
+ {
+ session.close();
+ }
sf.close();
}
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-15 19:16:23 UTC (rev 7739)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/OrderingOnBackupTest.java 2009-08-16 09:34:46 UTC (rev 7740)
@@ -328,7 +328,7 @@
catch (Throwable e)
{
e.printStackTrace();
- errors.incrementAndGet();
+ errors.incrementAndGet();
}
finally
{
More information about the jboss-cvs-commits
mailing list