[jboss-cvs] JBossAS SVN: r112461 - in projects/jboss-jca/branches/Branch_1_0: core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 21 09:12:40 EST 2011
Author: jesper.pedersen
Date: 2011-11-21 09:12:40 -0500 (Mon, 21 Nov 2011)
New Revision: 112461
Modified:
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolUtility.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java
projects/jboss-jca/branches/Branch_1_0/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java
projects/jboss-jca/branches/Branch_1_0/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java
Log:
[JBJCA-701] Remove getIdleTimeout()
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java 2011-11-21 14:10:19 UTC (rev 112460)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java 2011-11-21 14:12:40 UTC (rev 112461)
@@ -134,14 +134,6 @@
}
/**
- * @return the idleTimeout in milliseconds
- */
- public long getIdleTimeout()
- {
- return idleTimeoutMinutes.get() * 1000 * 60;
- }
-
- /**
* @return the idleTimeout
*/
public int getIdleTimeoutMinutes()
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2011-11-21 14:10:19 UTC (rev 112460)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2011-11-21 14:12:40 UTC (rev 112461)
@@ -171,10 +171,10 @@
*/
public void reenable()
{
- if (poolConfiguration.getIdleTimeout() > 0L)
+ if (poolConfiguration.getIdleTimeoutMinutes() > 0)
{
//Register removal support
- IdleRemover.registerPool(this, poolConfiguration.getIdleTimeout());
+ IdleRemover.registerPool(this, poolConfiguration.getIdleTimeoutMinutes() * 1000 * 60);
}
if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationMillis() > 0)
@@ -530,7 +530,7 @@
public void removeIdleConnections()
{
ArrayList<ConnectionListener> destroy = null;
- long timeout = System.currentTimeMillis() - poolConfiguration.getIdleTimeout();
+ long timeout = System.currentTimeMillis() - (poolConfiguration.getIdleTimeoutMinutes() * 1000 * 60);
boolean cont = true;
while (cont)
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolUtility.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolUtility.java 2011-11-21 14:10:19 UTC (rev 112460)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolUtility.java 2011-11-21 14:12:40 UTC (rev 112461)
@@ -96,7 +96,7 @@
sb.append(" MinSize: ").append(pc.getMinSize()).append(newLine);
sb.append(" MaxSize: ").append(pc.getMaxSize()).append(newLine);
sb.append(" BlockingTimeout: ").append(pc.getBlockingTimeout()).append(newLine);
- sb.append(" IdleTimeout: ").append(pc.getIdleTimeout()).append(newLine);
+ sb.append(" IdleTimeoutMinutes: ").append(pc.getIdleTimeoutMinutes()).append(newLine);
sb.append(" BackgroundValidation: ").append(pc.isBackgroundValidation()).append(newLine);
sb.append(" BackgroundValidationMillis: ").append(pc.getBackgroundValidationMillis()).append(newLine);
sb.append(" StrictMin: ").append(pc.isStrictMin()).append(newLine);
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2011-11-21 14:10:19 UTC (rev 112460)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2011-11-21 14:12:40 UTC (rev 112461)
@@ -204,10 +204,10 @@
*/
public void reenable()
{
- if (poolConfiguration.getIdleTimeout() > 0L)
+ if (poolConfiguration.getIdleTimeoutMinutes() > 0)
{
//Register removal support
- IdleRemover.registerPool(this, poolConfiguration.getIdleTimeout());
+ IdleRemover.registerPool(this, poolConfiguration.getIdleTimeoutMinutes() * 1000 * 60);
}
if (poolConfiguration.isBackgroundValidation() && poolConfiguration.getBackgroundValidationMillis() > 0)
@@ -573,7 +573,7 @@
public void removeIdleConnections()
{
ArrayList<ConnectionListener> destroy = null;
- long timeout = System.currentTimeMillis() - poolConfiguration.getIdleTimeout();
+ long timeout = System.currentTimeMillis() - (poolConfiguration.getIdleTimeoutMinutes() * 1000 * 60);
while (true)
{
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java 2011-11-21 14:10:19 UTC (rev 112460)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java 2011-11-21 14:12:40 UTC (rev 112461)
@@ -80,10 +80,8 @@
{
PoolConfiguration params = new PoolConfiguration();
assertEquals(30, params.getIdleTimeoutMinutes());
- assertEquals(30 * 1000 * 60, params.getIdleTimeout());
params.setIdleTimeoutMinutes(20);
assertEquals(20, params.getIdleTimeoutMinutes());
- assertEquals(20 * 1000 * 60, params.getIdleTimeout());
}
/**
Modified: projects/jboss-jca/branches/Branch_1_0/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java 2011-11-21 14:10:19 UTC (rev 112460)
+++ projects/jboss-jca/branches/Branch_1_0/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java 2011-11-21 14:12:40 UTC (rev 112461)
@@ -77,10 +77,8 @@
PropertySimple blockingTimeoutProp = new PropertySimple("blocking-timeout-millis", blTimeout);
config.put(blockingTimeoutProp);
- Long idleTimeoutMills = poolConfig.getIdleTimeout();
-
- Integer idleTimeout = (int)(idleTimeoutMills / (1000 * 60)); // convert to minutes
- PropertySimple idleTimeoutProp = new PropertySimple("idle-timeout-minutes", idleTimeout);
+ Integer idleTimeoutMinutes = poolConfig.getIdleTimeoutMinutes();
+ PropertySimple idleTimeoutProp = new PropertySimple("idle-timeout-minutes", idleTimeoutMinutes);
config.put(idleTimeoutProp);
PropertySimple prefillProp = new PropertySimple("prefill", Boolean.valueOf(poolConfig.isPrefill()));
Modified: projects/jboss-jca/branches/Branch_1_0/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java 2011-11-21 14:10:19 UTC (rev 112460)
+++ projects/jboss-jca/branches/Branch_1_0/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java 2011-11-21 14:12:40 UTC (rev 112461)
@@ -171,14 +171,14 @@
int maxPoolSize = 15;
long backValidationTime = 30000;
long blockingTimeout = 10000;
- long idleTimeOut = 15;
+ int idleTimeOutMinutes = 15;
config.put(new PropertySimple("min-pool-size", minPoolSize));
config.put(new PropertySimple("max-pool-size", maxPoolSize));
config.put(new PropertySimple("background-validation", true));
config.put(new PropertySimple("background-validation-millis", backValidationTime));
config.put(new PropertySimple("blocking-timeout-millis", blockingTimeout));
- config.put(new PropertySimple("idle-timeout-minutes", idleTimeOut));
+ config.put(new PropertySimple("idle-timeout-minutes", idleTimeOutMinutes));
config.put(new PropertySimple("prefill", false));
config.put(new PropertySimple("use-strict-min", true));
config.put(new PropertySimple("use-fast-fail", true));
@@ -191,7 +191,7 @@
assertTrue(poolConfig.isBackgroundValidation());
assertEquals(backValidationTime, poolConfig.getBackgroundValidationMillis());
assertEquals(blockingTimeout, poolConfig.getBlockingTimeout());
- assertEquals(idleTimeOut * 60 * 1000L, poolConfig.getIdleTimeout());
+ assertEquals(idleTimeOutMinutes, poolConfig.getIdleTimeoutMinutes());
assertFalse(poolConfig.isPrefill());
assertTrue(poolConfig.isStrictMin());
assertTrue(poolConfig.isUseFastFail());
More information about the jboss-cvs-commits
mailing list