[hornetq-commits] JBoss hornetq SVN: r8043 - in trunk: src/main/org/hornetq/jms/client and 1 other directories.

[do-not-reply at jboss.org]

Author: timfox
Date: 2009-10-05 08:54:00 -0400 (Mon, 05 Oct 2009)
New Revision: 8043

Modified:
   trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java
   trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
   trunk/src/main/org/hornetq/jms/client/HornetQConnection.java
   trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseOnGCTest.java
Log:
fixed tests

Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java	2009-10-05 08:49:23 UTC (rev 8042)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java	2009-10-05 12:54:00 UTC (rev 8043)
@@ -224,7 +224,6 @@
       }
       else if (sendBlocking)
       {
-         //log.info("sending blocking");
          channel.sendBlocking(message);
       }
       else

Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java	2009-10-05 08:49:23 UTC (rev 8042)
+++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java	2009-10-05 12:54:00 UTC (rev 8043)
@@ -490,7 +490,7 @@
       boolean done = false;
 
       synchronized (failoverLock)
-      {
+      {         
          if (connection == null || connection.getID() != connectionID)
          {
             // We already failed over/reconnected - probably the first failure came in, all the connections were failed
@@ -541,7 +541,7 @@
          {
             attemptReconnect = reconnectAttempts != 0;
          }
-
+         
          if (attemptFailover || attemptReconnect)
          {
             lockChannel1();
@@ -628,6 +628,12 @@
                oldConnection.destroy();
             }
          }
+         else
+         {
+            connection.destroy();
+            
+            connection = null;
+         }
 
          // We always call the failure listeners
          callFailureListeners(me);

Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnection.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQConnection.java	2009-10-05 08:49:23 UTC (rev 8042)
+++ trunk/src/main/org/hornetq/jms/client/HornetQConnection.java	2009-10-05 12:54:00 UTC (rev 8043)
@@ -541,6 +541,8 @@
       try
       {
          initialSession = sessionFactory.createSession(username, password, false, false, false, false, 0);
+         
+         initialSession.addFailureListener(listener);
       }
       catch (HornetQException me)
       {
@@ -565,7 +567,7 @@
          {
             return;
          }
-
+         
          HornetQConnection conn = connectionRef.get();
 
          if (conn != null)

Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseOnGCTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseOnGCTest.java	2009-10-05 08:49:23 UTC (rev 8042)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseOnGCTest.java	2009-10-05 12:54:00 UTC (rev 8043)
@@ -271,7 +271,7 @@
       ClientSession session2 = sf.createSession(false, true, true);
       ClientSession session3 = sf.createSession(false, true, true);
 
-      assertEquals(3, server.getRemotingService().getConnections().size());
+      assertEquals(1, server.getRemotingService().getConnections().size());
 
       WeakReference<ClientSession> ref1 = new WeakReference<ClientSession> (session1); 
       WeakReference<ClientSession> ref2 = new WeakReference<ClientSession> (session2);