[jboss-cvs] JBossAS SVN: r108519 - in projects/jboss-jca/trunk/core/src: main/java/org/jboss/jca/core/connectionmanager/pool/mcp and 1 other directories.

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

Author: jesper.pedersen
Date: 2010-10-12 09:53:29 -0400 (Tue, 12 Oct 2010)
New Revision: 108519

Modified:
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
   projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java
Log:
Fix background validation interval

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java	2010-10-12 12:16:19 UTC (rev 108518)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java	2010-10-12 13:53:29 UTC (rev 108519)
@@ -185,7 +185,7 @@
     */
    public long getBackgroundValidationInterval()
    {
-      return backgroundValidationMinutes * 1000L;
+      return backgroundValidationMinutes * 60000L;
    }
 
    /**

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java	2010-10-12 12:16:19 UTC (rev 108518)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java	2010-10-12 13:53:29 UTC (rev 108519)
@@ -178,13 +178,13 @@
     */
    public void reenable()
    {
-      if (poolConfiguration.getIdleTimeout() != 0L)
+      if (poolConfiguration.getIdleTimeout() > 0L)
       {
          //Register removal support
          IdleRemover.registerPool(this, poolConfiguration.getIdleTimeout());
       }
       
-      if (poolConfiguration.getBackgroundValidationInterval() > 0)
+      if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationInterval() > 0)
       {
          log.debug("Registering for background validation at interval " + 
                    poolConfiguration.getBackgroundValidationInterval());

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java	2010-10-12 12:16:19 UTC (rev 108518)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java	2010-10-12 13:53:29 UTC (rev 108519)
@@ -188,13 +188,13 @@
     */
    public void reenable()
    {
-      if (poolConfiguration.getIdleTimeout() != 0L)
+      if (poolConfiguration.getIdleTimeout() > 0L)
       {
          //Register removal support
          IdleRemover.registerPool(this, poolConfiguration.getIdleTimeout());
       }
       
-      if (poolConfiguration.getBackgroundValidationInterval() > 0)
+      if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationInterval() > 0)
       {
          log.debug("Registering for background validation at interval " + 
                    poolConfiguration.getBackgroundValidationInterval());

Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java	2010-10-12 12:16:19 UTC (rev 108518)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java	2010-10-12 13:53:29 UTC (rev 108519)
@@ -96,11 +96,11 @@
       assertEquals(0L, params.getBackgroundValidationInterval());
 
       params.setBackgroundValidation(true);
-      params.setBackgroundValidationMinutes(50);
+      params.setBackgroundValidationMinutes(5);
 
       assertTrue(params.isBackgroundValidation());
-      assertEquals(50, params.getBackgroundValidationMinutes());
-      assertEquals(50000L, params.getBackgroundValidationInterval());
+      assertEquals(5, params.getBackgroundValidationMinutes());
+      assertEquals(300000L, params.getBackgroundValidationInterval());
    }
 
    /**