[hornetq-commits] JBoss hornetq SVN: r12038 - in branches/Branch_2_2_AS7/src/main/org/hornetq: ra and 1 other directory.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2012-01-22 03:38:10 -0500 (Sun, 22 Jan 2012)
New Revision: 12038

Modified:
   branches/Branch_2_2_AS7/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java
   branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
Log:
https://issues.jboss.org/browse/HORNETQ-828 - fix method call and clean resources properly

Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java	2012-01-21 10:16:47 UTC (rev 12037)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/core/protocol/core/impl/ChannelImpl.java	2012-01-22 08:38:10 UTC (rev 12038)
@@ -352,7 +352,7 @@
       if(failingOver)
       {
          failingOver = false;
-         failoverCondition.notifyAll();
+         failoverCondition.signalAll();
       }
       closed = true;
    }

Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java
===================================================================
--- branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java	2012-01-21 10:16:47 UTC (rev 12037)
+++ branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java	2012-01-22 08:38:10 UTC (rev 12038)
@@ -823,11 +823,13 @@
       if(connectionFactory != null)
       {
          connectionFactory.close();
+         connectionFactory = null;
       }
 
       if(recoveryConnectionFactory != null)
       {
          recoveryConnectionFactory.close();
+         recoveryConnectionFactory = null;
       }
    }
 }