[jboss-cvs] JBossAS SVN: r111220 - projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool.

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

Author: jesper.pedersen
Date: 2011-04-20 08:55:21 -0400 (Wed, 20 Apr 2011)
New Revision: 111220

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
Log:
Remove SubPool instead of ManagedConnectionPool

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java	2011-04-20 08:31:51 UTC (rev 111219)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java	2011-04-20 12:55:21 UTC (rev 111220)
@@ -237,7 +237,7 @@
     */
    public void flush(boolean kill)
    {
-      Set<ManagedConnectionPool> clearMcps = new HashSet<ManagedConnectionPool>();
+      Set<SubPoolContext> clearSubPools = new HashSet<SubPoolContext>();
 
       Iterator<SubPoolContext> itSubPoolContexts = subPools.values().iterator();
       SubPoolContext subPoolContext = null;
@@ -249,15 +249,17 @@
          mcp.flush(kill);
 
          if (mcp.isEmpty())
-            clearMcps.add(mcp);
+            clearSubPools.add(subPoolContext);
       }
 
-      if (clearMcps.size() > 0)
+      if (clearSubPools.size() > 0)
       {
-         for (ManagedConnectionPool mcp : clearMcps)
+         for (SubPoolContext spc : clearSubPools)
          {
+            ManagedConnectionPool mcp = spc.getSubPool();
             mcp.shutdown();
-            subPools.values().remove(mcp);
+
+            subPools.values().remove(spc);
          }
       }
    }