[jboss-cvs] JBoss Messaging SVN: r7709 - in trunk: src/main/org/jboss/messaging/core/remoting/impl and 1 other directories.

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

Author: timfox
Date: 2009-08-11 14:57:24 -0400 (Tue, 11 Aug 2009)
New Revision: 7709

Modified:
   trunk/build-messaging.xml
   trunk/build.xml
   trunk/src/main/org/jboss/messaging/core/remoting/impl/ChannelImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java
Log:
a few tweaks

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-08-11 16:19:24 UTC (rev 7708)
+++ trunk/build-messaging.xml	2009-08-11 18:57:24 UTC (rev 7709)
@@ -1064,6 +1064,18 @@
          <param name="tests.param" value="**/org/jboss/messaging/tests/integration/**/*${test-mask}.class"/>
       </antcall>
    </target>
+   
+   <target name="failover-tests" depends="jar, compile-unit-tests">
+      <antcall inheritall="true" inheritrefs="true" target="tests">
+         <param name="tests.param" value="**/org/jboss/messaging/tests/integration/cluster/failover/**/*${test-mask}.class"/>
+      </antcall>
+   </target>
+   
+   <target name="distribution-tests" depends="jar, compile-unit-tests">
+      <antcall inheritall="true" inheritrefs="true" target="tests">
+         <param name="tests.param" value="**/org/jboss/messaging/tests/integration/cluster/distribution/**/*${test-mask}.class"/>
+      </antcall>
+   </target>   
 
    <target name="concurrent-tests" depends="jar, compile-unit-tests">
       <antcall inheritall="true" inheritrefs="true" target="tests">

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2009-08-11 16:19:24 UTC (rev 7708)
+++ trunk/build.xml	2009-08-11 18:57:24 UTC (rev 7709)
@@ -225,6 +225,16 @@
       <ant antfile="build-messaging.xml" target="integration-tests"/>
       <ant antfile="build-messaging.xml" target="compile-reports"/>
    </target>
+   
+   <target name="failover-tests" depends="createthirdparty">
+	   <ant antfile="build-messaging.xml" target="failover-tests"/>
+	   <ant antfile="build-messaging.xml" target="compile-reports"/>
+   </target>   
+   
+   <target name="distribution-tests" depends="createthirdparty">
+	   <ant antfile="build-messaging.xml" target="distribution-tests"/>
+	   <ant antfile="build-messaging.xml" target="compile-reports"/>
+   </target>
 
     <target name="concurrent-tests" depends="createthirdparty">
       <ant antfile="build-messaging.xml" target="concurrent-tests"/>

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/ChannelImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/ChannelImpl.java	2009-08-11 16:19:24 UTC (rev 7708)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/ChannelImpl.java	2009-08-11 18:57:24 UTC (rev 7709)
@@ -406,33 +406,32 @@
       List<Runnable> toRun = new ArrayList<Runnable>();
 
       synchronized (replicationLock)
+      {         
+         playedResponsesOnFailure = true;
+         
+         responseActionCount = 0;
+      }
+
+      while (true)
       {
          // Execute all the response actions now
+         
+         Runnable action = responseActions.poll();
 
-         while (true)
+         if (action != null)
          {
-            Runnable action = responseActions.poll();
-
-            if (action != null)
-            {
-               toRun.add(action);
-            }
-            else
-            {
-               break;
-            }
+            toRun.add(action);
          }
-
-         responseActionCount = 0;
-
-         playedResponsesOnFailure = true;
-
-         for (Runnable action : toRun)
+         else
          {
-            action.run();
+            break;
          }
       }
-
+      
+      for (Runnable action : toRun)
+      {
+         action.run();
+      }      
    }
 
    public void setHandler(final ChannelHandler handler)

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java	2009-08-11 16:19:24 UTC (rev 7708)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/remoting/PingTest.java	2009-08-11 18:57:24 UTC (rev 7709)
@@ -150,6 +150,8 @@
       assertTrue(serverConn == serverConn2);
 
       session.close();
+      
+      csf.close();
    }
 
    /*
@@ -204,6 +206,8 @@
       assertTrue(serverConn == serverConn2);
 
       session.close();
+      
+      csf.close();
    }
 
    /*
@@ -281,6 +285,8 @@
       assertNotNull(serverListener.getException());
 
       session.close();
+      
+      csf.close();
    }
 
    /*
@@ -342,10 +348,7 @@
 
       session.close();
 
-      tearDown();
-
-      setUp();
-
+      csf.close();
    }
 
    // Package protected ---------------------------------------------