[Jboss-cvs] JBossAS SVN: r57101 - trunk/connector/src/main/org/jboss/resource/connectionmanager

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

Author: weston.price at jboss.com
Date: 2006-09-23 00:04:28 -0400 (Sat, 23 Sep 2006)
New Revision: 57101

Modified:
   trunk/connector/src/main/org/jboss/resource/connectionmanager/IdleRemover.java
   trunk/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java
Log:
[JBAS-3511] Adding new interface for idle connection removal to allow JMSServerSessionPool
to use IdleRemover for new pool handling. 

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/IdleRemover.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/IdleRemover.java	2006-09-23 04:04:04 UTC (rev 57100)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/IdleRemover.java	2006-09-23 04:04:28 UTC (rev 57101)
@@ -34,6 +34,7 @@
  *
  * @author <a href="mailto:d_jencks at users.sourceforge.net">David Jencks</a>
  * @author <a href="mailto:adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="mailto:weston.price at jboss.com>Weston Price</a>
  * @version $Revision$
  */
 public class IdleRemover 
@@ -48,12 +49,12 @@
 
    private static final IdleRemover remover = new IdleRemover();
 
-   public static void  registerPool(InternalManagedConnectionPool mcp, long interval)
+   public static void registerPool(IdleConnectionRemovalSupport mcp, long interval)
    {
       remover.internalRegisterPool(mcp, interval);
    }
 
-   public static void unregisterPool(InternalManagedConnectionPool mcp)
+   public static void unregisterPool(IdleConnectionRemovalSupport mcp)
    {
       remover.internalUnregisterPool(mcp);
    }
@@ -84,7 +85,7 @@
       });
    }
    
-   private void internalRegisterPool(InternalManagedConnectionPool mcp, long interval)
+   private void internalRegisterPool(IdleConnectionRemovalSupport mcp, long interval)
    {
       log.debug("internalRegisterPool: registering pool with interval " + interval + " old interval: " + this.interval);
       synchronized (pools)
@@ -104,7 +105,7 @@
       }
    }
 
-   private void internalUnregisterPool(InternalManagedConnectionPool mcp)
+   private void internalUnregisterPool(IdleConnectionRemovalSupport mcp)
    {
       synchronized (pools)
       {
@@ -161,7 +162,7 @@
                   pools.wait(interval);
                   log.debug("run: IdleRemover notifying pools, interval: " + interval);
                   for (Iterator i = pools.iterator(); i.hasNext(); ) 
-                     ((InternalManagedConnectionPool)i.next()).removeTimedOut();
+                     ((InternalManagedConnectionPool)i.next()).removeIdleConnections();
                   next = System.currentTimeMillis() + interval;
                   if (next < 0) 
                      next = Long.MAX_VALUE;      

Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java	2006-09-23 04:04:04 UTC (rev 57100)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java	2006-09-23 04:04:28 UTC (rev 57101)
@@ -49,7 +49,7 @@
  * @author <a href="mailto:weston.price at jboss.com">Weston Price</a>
  * @version $Revision$
  */
-public class InternalManagedConnectionPool
+public class InternalManagedConnectionPool implements IdleConnectionRemovalSupport
 {
    /** The managed connection factory */
    private final ManagedConnectionFactory mcf;
@@ -413,7 +413,7 @@
       }
    }
 
-   public void removeTimedOut()
+   public void removeIdleConnections()
    {
       ArrayList destroy = null;
       long timeout = System.currentTimeMillis() - poolParams.idleTimeout;