jmcnally 2003/07/25 18:23:22
Modified: dbcp/src/java/org/apache/commons/dbcp/jdbc2pool
Jdbc2PoolDataSource.java
Log:
code was selecting the maximum as default instead of the desired minumum.
use the Math.min method to be more obvious as well as correct.
Revision Changes Path
1.13 +11 -14
jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/jdbc2pool/Jdbc2PoolDataSource.java
Index: Jdbc2PoolDataSource.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/dbcp/src/java/org/apache/commons/dbcp/jdbc2pool/Jdbc2PoolDataSource.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Jdbc2PoolDataSource.java 29 Jun 2003 12:42:16 -0000 1.12
+++ Jdbc2PoolDataSource.java 26 Jul 2003 01:23:21 -0000 1.13
@@ -166,10 +166,8 @@
private boolean defaultAutoCommit = false;
private int defaultMaxActive = GenericObjectPool.DEFAULT_MAX_ACTIVE;
private int defaultMaxIdle = GenericObjectPool.DEFAULT_MAX_IDLE;
- private int defaultMaxWait =
- (((long)Integer.MAX_VALUE) < GenericObjectPool.DEFAULT_MAX_WAIT) ?
- (int)(GenericObjectPool.DEFAULT_MAX_WAIT) :
- Integer.MAX_VALUE;
+ private int defaultMaxWait = (int)Math.min((long)Integer.MAX_VALUE,
+ GenericObjectPool.DEFAULT_MAX_WAIT);
private boolean defaultReadOnly = false;
/** Description */
private String description = null;
@@ -186,15 +184,14 @@
private Map perUserDefaultReadOnly = null;
private boolean _testOnBorrow = GenericObjectPool.DEFAULT_TEST_ON_BORROW;
private boolean _testOnReturn = GenericObjectPool.DEFAULT_TEST_ON_RETURN;
- private int _timeBetweenEvictionRunsMillis =
- (((long)Integer.MAX_VALUE) <
GenericObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS) ?
- (int)(GenericObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS) :
- Integer.MAX_VALUE;;
- private int _numTestsPerEvictionRun =
GenericObjectPool.DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
- private int _minEvictableIdleTimeMillis =
- (((long)Integer.MAX_VALUE) <
GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS) ?
- (int)(GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS) :
- Integer.MAX_VALUE;;
+ private int _timeBetweenEvictionRunsMillis = (int)
+ Math.min((long)Integer.MAX_VALUE,
+ GenericObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS);
+ private int _numTestsPerEvictionRun =
+ GenericObjectPool.DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
+ private int _minEvictableIdleTimeMillis = (int)
+ Math.min((long)Integer.MAX_VALUE,
+ GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS);
private boolean _testWhileIdle = GenericObjectPool.DEFAULT_TEST_WHILE_IDLE;
private String validationQuery = null;
private boolean testPositionSet = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
