[jboss-cvs] JBoss Messaging SVN: r7757 - trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-08-17 11:59:53 -0400 (Mon, 17 Aug 2009)
New Revision: 7757

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
Log:
put session.close() in a finally block to clean up resources in case of failures...

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-17 15:50:05 UTC (rev 7756)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/FailoverScheduledMessageTest.java	2009-08-17 15:59:53 UTC (rev 7757)
@@ -144,36 +144,51 @@
       };
       
       t.start();
-                   
-      for (int i = 0; i < numMessages; i++)
+
+      ClientSession session2 = null;
+      try
       {
+         for (int i = 0; i < numMessages; i++)
+         {
+            ClientMessage message = consumer1.receive(delay * 2);
+
+            assertNotNull(message);
+
+            message.acknowledge();
+         }      
+
          ClientMessage message = consumer1.receive(delay * 2);
-                           
-         assertNotNull(message);
-            
-         message.acknowledge();
-      }      
-      
-      ClientMessage message = consumer1.receive(delay * 2);
-      
-      assertNull(message);
-      
-      t.join();
-                   
-      session1.close();
-      
-      //Make sure no more messages
-      ClientSession session2 = sf1.createSession(false, true, true);
-      
-      session2.start();
-      
-      ClientConsumer consumer2 = session2.createConsumer(ADDRESS);
-      
-      message = consumer2.receive(1000);
-      
-      assertNull(message);
-      
-      session2.close();      
+
+         assertNull(message);
+
+         t.join();
+
+         session1.close();
+
+         //Make sure no more messages
+         session2 = sf1.createSession(false, true, true);
+
+         session2.start();
+
+         ClientConsumer consumer2 = session2.createConsumer(ADDRESS);
+
+         message = consumer2.receive(1000);
+
+         assertNull(message);
+
+         session2.close(); 
+      }
+      finally 
+      {
+         if (session1 != null)
+         {
+            session1.close();
+         }
+         if (session2 != null)
+         {
+            session2.close();
+         }
+      }
    }
    
    // Package protected ---------------------------------------------