[jboss-cvs] JBoss Messaging SVN: r7741 - in trunk: src/main/org/jboss/messaging/jms/client and 9 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Sun Aug 16 08:42:52 EDT 2009


Author: timfox
Date: 2009-08-16 08:42:51 -0400 (Sun, 16 Aug 2009)
New Revision: 7741

Modified:
   trunk/build-messaging.xml
   trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
   trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.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/cluster/failover/FailureListenerOnFailoverTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/JBossConnectionFactoryTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.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/management/JMSQueueControlTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlUsingCoreTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityNotificationTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/server/LVQRecoveryTest.java
Log:
fixed more tests that left connections/sessions open

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/build-messaging.xml	2009-08-16 12:42:51 UTC (rev 7741)
@@ -321,6 +321,9 @@
       <delete dir="${test.jms.build.dir}"/>
       <delete dir="${test.joram.build.dir}"/>
       <delete dir="${thirdparty.dir}"/>
+      <delete>
+         <fileset dir="${logs.dir}" includes="*"/>
+      </delete>
       <ant antfile="${examples.dir}/build.xml" target="clean" inheritall="false"/>
    </target>
 

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -578,7 +578,10 @@
             }
             catch (JMSException e)
             {
-               log.error("Failed to get exception listener");
+               if (!conn.closed)
+               {
+                  log.error("Failed to get exception listener", e);
+               }
             }
          }
       }

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/MessageGroupingTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -383,6 +383,7 @@
       }
       consumer = this.clientSession.createConsumer(qName);
       assertNull(consumer.receive(500));
+      clientSession.close();
    }
 
    public void testMultipleGroupingXACommit() throws Exception

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/PagingTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -669,11 +669,7 @@
 
             producer.send(message);
          }
-         
-         session.close();
 
-         session = sf.createSession(null, null, false, true, true, false, 0);
-
          ClientConsumer consumer = session.createConsumer(ADDRESS);
 
          session.start();

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/RedeliveryConsumerTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -217,10 +217,10 @@
       {
          // If non Strict, at least rollback/cancel should still update the delivery-counts
          session.rollback(true);         
+         
+         session.close();
       }
       
-      session.close();
-
       server.stop();
 
       server.start();

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/SessionTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -64,8 +64,8 @@
                latch.countDown();
             }
          });
-
-         clientSession.close();
+         
+         //Make sure failure listener is closed if server is stopped without session being closed first
          server.stop();
          assertTrue(latch.await(5, TimeUnit.SECONDS));
          

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -411,6 +411,8 @@
          session.deleteQueue("testaddress" + i);
          i++;
       }
+      
+      csession.close();
 
       // Now fail again and fail to reconnect
 

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/JBossConnectionFactoryTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -104,21 +104,22 @@
                           ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
                           ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS,
                           ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN);
+      Connection conn = null;
+      
       try
       {
-         Connection conn = cf.createConnection();
+         conn = cf.createConnection();
 
          Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 
-         fail("Should throw exception");
-
-         conn.close();
+         fail("Should throw exception");        
       }
       catch (Exception e)
       {
          e.printStackTrace();
          // Ok
       }
+      conn.close();
 
       log.info("Got here");
 
@@ -128,7 +129,7 @@
       staticConnectors.add(pair0);
       cf.setStaticConnectors(staticConnectors);
 
-      Connection conn = cf.createConnection();
+      conn = cf.createConnection();
 
       Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
 

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/cluster/management/ReplicationAwareJMSQueueControlWrapperTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -63,6 +63,8 @@
 
    private JBossQueue otherQueue;
 
+   private Connection connection;
+   
    private Session session;
 
    private JMSQueueControl liveQueueControl;
@@ -308,7 +310,7 @@
    // Package protected ---------------------------------------------
 
    // Protected -----------------------------------------------------
-   
+         
    @Override
    protected void setUp() throws Exception
    {
@@ -332,7 +334,7 @@
       backupServerManager.createQueue(otherQueueName, otherQueueName, null, true);
       otherQueue = new JBossQueue(otherQueueName);
       
-      Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
+      connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName());
       session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
       
       liveQueueControl = createJMSQueueControl(queue.getQueueName(), liveMBeanServer);
@@ -344,7 +346,7 @@
    @Override
    protected void tearDown() throws Exception
    {
-      session.close();
+      connection.close();           
       
       liveServerManager = null;
       

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/connection/ExceptionListenerTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -21,8 +21,11 @@
  */
 package org.jboss.messaging.tests.integration.jms.connection;
 
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
+import javax.jms.Connection;
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import javax.jms.Session;
+
 import org.jboss.messaging.core.client.impl.ClientSessionInternal;
 import org.jboss.messaging.core.config.Configuration;
 import org.jboss.messaging.core.config.TransportConfiguration;
@@ -37,11 +40,6 @@
 import org.jboss.messaging.tests.integration.jms.server.management.NullInitialContext;
 import org.jboss.messaging.tests.util.UnitTestCase;
 
-import javax.jms.Connection;
-import javax.jms.ExceptionListener;
-import javax.jms.JMSException;
-import javax.jms.Session;
-
 /**
  * 
  * A ExceptionListenerTest
@@ -127,7 +125,9 @@
       
       coreSession.getConnection().fail(new MessagingException(MessagingException.INTERNAL_ERROR, "blah"));
       
-      assertEquals(1, listener.numCalls);                  
+      assertEquals(1, listener.numCalls);
+      
+      conn.close();
    }
    
    public void testListenerCalledForOneConnectionAndSessions() throws Exception
@@ -161,45 +161,10 @@
       coreSession3.getConnection().fail(new MessagingException(MessagingException.INTERNAL_ERROR, "blah"));
       
       //Listener should only be called once even if all sessions connections die
-      assertEquals(1, listener.numCalls);                  
-   }
-   
-   public void testCloseOneConnectionOnGC() throws Exception
-   {
-      Connection conn = cf.createConnection();
-           
-      assertEquals(1, server.getRemotingService().getConnections().size());
+      assertEquals(1, listener.numCalls);    
       
-      conn = null;
-
-      System.gc();
-      System.gc();
-      System.gc();
-      
-      Thread.sleep(2000);
-                  
-      assertEquals(0, server.getRemotingService().getConnections().size());
+      conn.close();
    }
    
-   public void testCloseSeveralSessionOnGC() throws Exception
-   {
-      Connection conn1 = cf.createConnection();
-      Connection conn2 = cf.createConnection();
-      Connection conn3 = cf.createConnection();     
-      
-      assertEquals(3, server.getRemotingService().getConnections().size());
-      
-      conn1 = null;
-      conn2 = null;
-      conn3 = null;
-
-      System.gc();
-      System.gc();
-      System.gc();
-      
-      Thread.sleep(2000);
-                     
-      assertEquals(0, server.getRemotingService().getConnections().size());
-   }
    
 }

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-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/consumer/ConsumerTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -125,7 +125,7 @@
       SimpleString queueName = new SimpleString(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + Q_NAME);
       assertEquals(0, ((Queue)server.getPostOffice().getBinding(queueName).getBindable()).getDeliveringCount());
       assertEquals(0, ((Queue)server.getPostOffice().getBinding(queueName).getBindable()).getMessageCount());
-      session.close();
+      conn.close();
    }
 
    public void testPreCommitAcksWithMessageExpiry() throws Exception
@@ -153,6 +153,6 @@
       SimpleString queueName = new SimpleString(JBossQueue.JMS_QUEUE_ADDRESS_PREFIX + Q_NAME);
       assertEquals(0, ((Queue)server.getPostOffice().getBinding(queueName).getBindable()).getDeliveringCount());
       assertEquals(0, ((Queue)server.getPostOffice().getBinding(queueName).getBindable()).getMessageCount());
-      session.close();
+      conn.close();
    }
 }

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -477,7 +477,7 @@
       assertEquals(2, queueControl.countMessages(key + " =" + matchingValue));
       assertEquals(1, queueControl.countMessages(key + " =" + unmatchingValue));
 
-      session.close();
+      connection.close();
    }
 
    public void testGetDeadLetterAddress() throws Exception

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -348,6 +348,8 @@
       Map<String, Object>[] messages = topicControl.listMessagesForSubscription(JBossTopic.createQueueNameForDurableSubscription(clientID,
                                                                                                                                  subscriptionName));
       assertEquals(3, messages.length);
+      
+      connection.close();
    }
 
    public void testListMessagesForSubscriptionAsJSON() throws Exception
@@ -368,6 +370,8 @@
       {
          assertEquals(ids[i], array.getJSONObject(i).get("JMSMessageID"));
       }
+      
+      connection.close();
    }
 
    public void testListMessagesForSubscriptionWithUnknownClientID() throws Exception

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/TopicControlUsingJMSTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -297,6 +297,8 @@
                                                       JBossTopic.createQueueNameForDurableSubscription(clientID,
                                                                                                        subscriptionName));
       assertEquals(3, data.length);
+      
+      connection.close();
    }
 
    public void testListMessagesForSubscriptionWithUnknownClientID() throws Exception

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlUsingCoreTest.java	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BridgeControlUsingCoreTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -179,6 +179,7 @@
    @Override
    protected void tearDown() throws Exception
    {
+      session.close();
       server_0.stop();
       server_1.stop();
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -1024,7 +1024,7 @@
       consumeMessages(1, session, deadLetterQueue);
 
       session.deleteQueue(queue);
-      session.deleteQueue(deadLetterQueue);
+      session.deleteQueue(deadLetterQueue);           
    }
 
    public void testChangeMessagePriority() throws Exception

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityNotificationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityNotificationTest.java	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/SecurityNotificationTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -131,6 +131,8 @@
       assertEquals("guest", notifications[0].getProperty(ManagementHelper.HDR_USER).toString());
       assertEquals(address.toString(), notifications[0].getProperty(ManagementHelper.HDR_ADDRESS).toString());
       assertEquals(CheckType.CREATE_DURABLE_QUEUE.toString(), notifications[0].getProperty(ManagementHelper.HDR_CHECK_TYPE).toString());
+      
+      guestSession.close();
    }
    
    // Package protected ---------------------------------------------

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/server/LVQRecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/server/LVQRecoveryTest.java	2009-08-16 09:34:46 UTC (rev 7740)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/server/LVQRecoveryTest.java	2009-08-16 12:42:51 UTC (rev 7741)
@@ -172,6 +172,17 @@
             //
          }
       }
+      if (clientSessionXa != null)
+      {
+         try
+         {
+            clientSessionXa.close();
+         }
+         catch (MessagingException e1)
+         {
+            //
+         }
+      }
       if (server != null && server.isStarted())
       {
          try




More information about the jboss-cvs-commits mailing list