[hornetq-commits] JBoss hornetq SVN: r10371 - in branches/Branch_2_2_EAP: tests/src/org/hornetq/tests/integration/cluster/reattach and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-03-25 20:38:27 -0400 (Fri, 25 Mar 2011)
New Revision: 10371

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
Log:
test fixes

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java	2011-03-25 22:30:26 UTC (rev 10370)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java	2011-03-26 00:38:27 UTC (rev 10371)
@@ -1062,8 +1062,6 @@
 
                channel.returnBlocking();
             }
-
-            channel.setTransferring(false);
          }
          catch (Throwable t)
          {
@@ -1071,6 +1069,7 @@
          }
          finally
          {
+            channel.setTransferring(false);
             channel.unlock();
          }
 

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java	2011-03-25 22:30:26 UTC (rev 10370)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java	2011-03-26 00:38:27 UTC (rev 10371)
@@ -25,8 +25,14 @@
 import org.hornetq.api.core.HornetQException;
 import org.hornetq.api.core.SimpleString;
 import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.api.core.client.*;
-import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
+import org.hornetq.api.core.client.ClientConsumer;
+import org.hornetq.api.core.client.ClientMessage;
+import org.hornetq.api.core.client.ClientProducer;
+import org.hornetq.api.core.client.ClientSession;
+import org.hornetq.api.core.client.ClientSessionFactory;
+import org.hornetq.api.core.client.HornetQClient;
+import org.hornetq.api.core.client.MessageHandler;
+import org.hornetq.api.core.client.ServerLocator;
 import org.hornetq.core.logging.Logger;
 import org.hornetq.core.remoting.impl.invm.InVMRegistry;
 import org.hornetq.core.server.HornetQServer;
@@ -256,11 +262,6 @@
 
    protected abstract boolean checkSize(ClientMessage message);
 
-   protected int getNumThreads()
-   {
-      return 10;
-   }
-
    protected ClientSession createAutoCommitSession(final ClientSessionFactory sf) throws Exception
    {
       return sf.createSession(false, true, true);
@@ -1197,6 +1198,11 @@
    {
       return 2;
    }
+   
+   protected int getNumThreads()
+   {
+      return 10;
+   }
 
    @Override
    protected void setUp() throws Exception

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java	2011-03-25 22:30:26 UTC (rev 10370)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java	2011-03-26 00:38:27 UTC (rev 10371)
@@ -16,10 +16,7 @@
 import org.hornetq.api.core.TransportConfiguration;
 import org.hornetq.api.core.client.HornetQClient;
 import org.hornetq.api.core.client.ServerLocator;
-import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
-import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
 import org.hornetq.core.config.Configuration;
-import org.hornetq.core.config.impl.ConfigurationImpl;
 import org.hornetq.core.server.HornetQServers;
 
 /**