[jboss-cvs] JBossAS SVN: r112458 - in projects/jboss-jca/trunk: core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 18 09:40:40 EST 2011
Author: jesper.pedersen
Date: 2011-11-18 09:40:39 -0500 (Fri, 18 Nov 2011)
New Revision: 112458
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java
Log:
[JBJCA-701] IdleTimeout unit incorrect
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java 2011-11-18 03:36:03 UTC (rev 112457)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java 2011-11-18 14:40:39 UTC (rev 112458)
@@ -42,8 +42,8 @@
/** Blocking timeout. In milliseconds */
private AtomicLong blockingTimeout;
- /** Idle timeout period. Default 30 mins. In milliseconds */
- private AtomicLong idleTimeout;
+ /** Idle timeout period. Default 30 mins */
+ private AtomicInteger idleTimeoutMinutes;
/** Background validation */
private AtomicBoolean backgroundValidation;
@@ -71,7 +71,7 @@
minSize = new AtomicInteger(0);
maxSize = new AtomicInteger(20);
blockingTimeout = new AtomicLong(30000);
- idleTimeout = new AtomicLong(1000 * 60 * 30);
+ idleTimeoutMinutes = new AtomicInteger(30);
backgroundValidation = new AtomicBoolean(false);
backgroundValidationMillis = new AtomicLong(0);
prefill = new AtomicBoolean(false);
@@ -134,19 +134,27 @@
}
/**
- * @return the idleTimeout
+ * @return the idleTimeout in milliseconds
*/
public long getIdleTimeout()
{
- return idleTimeout.get();
+ return idleTimeoutMinutes.get() * 1000 * 60;
}
/**
+ * @return the idleTimeout
+ */
+ public int getIdleTimeoutMinutes()
+ {
+ return idleTimeoutMinutes.get();
+ }
+
+ /**
* @param idleTimeout the idleTimeout to set
*/
- public void setIdleTimeout(long idleTimeout)
+ public void setIdleTimeoutMinutes(int idleTimeout)
{
- this.idleTimeout.set(idleTimeout);
+ this.idleTimeoutMinutes.set(idleTimeout);
}
/**
@@ -244,7 +252,7 @@
sb.append("[minSize=").append(minSize.get());
sb.append(" maxSize=").append(maxSize.get());
sb.append(" blockingTimeout=").append(blockingTimeout.get());
- sb.append(" idleTimeout=").append(idleTimeout.get());
+ sb.append(" idleTimeoutMinutes=").append(idleTimeoutMinutes.get());
sb.append(" backgroundValidation=").append(backgroundValidation.get());
sb.append(" backgroundValidationMillis=").append(backgroundValidationMillis.get());
sb.append(" prefill=").append(prefill.get());
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 2011-11-18 03:36:03 UTC (rev 112457)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java 2011-11-18 14:40:39 UTC (rev 112458)
@@ -79,9 +79,11 @@
public void testIdleTimeout()
{
PoolConfiguration params = new PoolConfiguration();
- assertEquals(1000 * 60 * 30, params.getIdleTimeout());
- params.setIdleTimeout(1000 * 60 * 20);
- assertEquals(1000 * 60 * 20, params.getIdleTimeout());
+ 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/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-11-18 03:36:03 UTC (rev 112457)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-11-18 14:40:39 UTC (rev 112458)
@@ -891,7 +891,7 @@
pc.setBlockingTimeout(tp.getBlockingTimeoutMillis().longValue());
if (tp.getIdleTimeoutMinutes() != null)
- pc.setIdleTimeout(tp.getIdleTimeoutMinutes().longValue());
+ pc.setIdleTimeoutMinutes(tp.getIdleTimeoutMinutes().intValue());
}
if (vp != null)
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-11-18 03:36:03 UTC (rev 112457)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-11-18 14:40:39 UTC (rev 112458)
@@ -636,7 +636,7 @@
pc.setBlockingTimeout(tp.getBlockingTimeoutMillis().longValue());
if (tp.getIdleTimeoutMinutes() != null)
- pc.setIdleTimeout(tp.getIdleTimeoutMinutes().longValue());
+ pc.setIdleTimeoutMinutes(tp.getIdleTimeoutMinutes().intValue());
}
if (vp != null)
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java 2011-11-18 03:36:03 UTC (rev 112457)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/PoolResourceComponent.java 2011-11-18 14:40:39 UTC (rev 112458)
@@ -122,8 +122,7 @@
// idle-timeout-minutes
Integer idleTimeoutMinutes = Integer.valueOf(config.getSimpleValue("idle-timeout-minutes", "30"));
- Long idleTimeoutMillis = Long.valueOf(idleTimeoutMinutes * 60 * 1000);
- poolConfig.setIdleTimeout(idleTimeoutMillis.longValue());
+ poolConfig.setIdleTimeoutMinutes(idleTimeoutMinutes.intValue());
// prefill
Boolean preFill = Boolean.valueOf(config.getSimpleValue("prefill", "true"));
Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java 2011-11-18 03:36:03 UTC (rev 112457)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/DsTestCase.java 2011-11-18 14:40:39 UTC (rev 112458)
@@ -162,7 +162,7 @@
boolean oldBackgroundValidation = poolConfig.isBackgroundValidation();
long oldBackgroundValidationTime = poolConfig.getBackgroundValidationMillis();
long oldBlockingTimeout = poolConfig.getBlockingTimeout();
- long oldIdleTimeout = poolConfig.getIdleTimeout();
+ int oldIdleTimeout = poolConfig.getIdleTimeoutMinutes();
boolean oldPreFill = poolConfig.isPrefill();
boolean oldUseStrictMin = poolConfig.isStrictMin();
boolean oldUseFastFail = poolConfig.isUseFastFail();
@@ -199,7 +199,7 @@
poolConfig.setBackgroundValidation(oldBackgroundValidation);
poolConfig.setBackgroundValidationMillis(oldBackgroundValidationTime);
poolConfig.setBlockingTimeout(oldBlockingTimeout);
- poolConfig.setIdleTimeout(oldIdleTimeout);
+ poolConfig.setIdleTimeoutMinutes(oldIdleTimeout);
poolConfig.setMaxSize(oldMaxPoolSize);
poolConfig.setMinSize(oldMinPoolSize);
poolConfig.setPrefill(oldPreFill);
More information about the jboss-cvs-commits
mailing list