[jboss-cvs] JBoss Messaging SVN: r7985 - branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering.

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

Author: gaohoward
Date: 2010-03-25 04:24:59 -0400 (Thu, 25 Mar 2010)
New Revision: 7985

Modified:
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
Log:
fix occasional test failure


Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2010-03-25 06:05:40 UTC (rev 7984)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2010-03-25 08:24:59 UTC (rev 7985)
@@ -555,6 +555,9 @@
          conn0.close();
          conn0 = null;
          
+         conn1.close();
+         conn1 = null;
+         
          //restart node0
          ServerManagement.stop(0);
          ServerManagement.start(0, config, false);
@@ -577,16 +580,6 @@
          catch (Exception ignore)
          {
          }
-
-         if (conn0!=null)
-         {
-            conn0.close();
-         }
-
-         if (conn1!=null)
-         {
-            conn1.close();
-         }
       }
    }