[hornetq-commits] JBoss hornetq SVN: r12054 - branches/Branch_2_2_AS7/src/main/org/hornetq/ra.

Author: ataylor Date: 2012-02-01 03:59:33 -0500 (Wed, 01 Feb 2012) New Revision: 12054 Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnection.java branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQResourceAdapter.java Log: fixed ra clean up code Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnection.java =================================================================== --- branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnection.java 2012-01-31 15:39:07 UTC (rev 12053) +++ branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnection.java 2012-02-01 08:59:33 UTC (rev 12054) @@ -249,8 +249,6 @@ HornetQRAManagedConnection.log.debug("Error unsetting the exception listener " + this, e); } - mcf.stop(); - destroyHandles(); try 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-31 15:39:07 UTC (rev 12053) +++ branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2012-02-01 08:59:33 UTC (rev 12054) @@ -321,6 +321,7 @@ } this.ra = (HornetQResourceAdapter)ra; + this.ra.setManagedConnectionFactory(this); } /** Modified: branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2012-01-31 15:39:07 UTC (rev 12053) +++ branches/Branch_2_2_AS7/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2012-02-01 08:59:33 UTC (rev 12054) @@ -16,6 +16,7 @@ import java.lang.reflect.Method; import java.security.AccessController; import java.security.PrivilegedAction; +import java.util.ArrayList; import java.util.HashMap; import java.util.Hashtable; import java.util.List; @@ -112,8 +113,10 @@ private String unparsedJndiParams; - RecoveryManager recoveryManager; + private RecoveryManager recoveryManager; + private final List<HornetQRAManagedConnectionFactory> managedConnectionFactories = new ArrayList<HornetQRAManagedConnectionFactory>(); + /** * Constructor */ @@ -261,6 +264,13 @@ activations.clear(); + for (HornetQRAManagedConnectionFactory managedConnectionFactory : managedConnectionFactories) + { + managedConnectionFactory.stop(); + } + + managedConnectionFactories.clear(); + if (defaultHornetQConnectionFactory != null) { defaultHornetQConnectionFactory.close(); @@ -1910,6 +1920,11 @@ } + public void setManagedConnectionFactory(HornetQRAManagedConnectionFactory hornetQRAManagedConnectionFactory) + { + managedConnectionFactories.add(hornetQRAManagedConnectionFactory); + } + /** This seems duplicate code all over the place, but for security reasons we can't let something like this to be open in a * utility class, as it would be a door to load anything you like in a safe VM. * For that reason any class trying to do a privileged block should do with the AccessController directly.