svn commit: r672591 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java

[sebb]

Author: sebb
Date: Sat Jun 28 16:16:23 2008
New Revision: 672591

URL: http://svn.apache.org/viewvc?rev=672591&view=rev
Log:
Remove unnecessary casts and unused local variables

Modified:
    
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java

Modified: 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java?rev=672591&r1=672590&r2=672591&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
 Sat Jun 28 16:16:23 2008
@@ -101,10 +101,10 @@
     private String dataSourceName = null;
     private boolean defaultAutoCommit = false;
     private int defaultTransactionIsolation = UNKNOWN_TRANSACTIONISOLATION;
-    private int maxActive = GenericObjectPool.DEFAULT_MAX_ACTIVE;
-    private int maxIdle = GenericObjectPool.DEFAULT_MAX_IDLE;
-    private int maxWait = (int)Math.min((long)Integer.MAX_VALUE,
-        GenericObjectPool.DEFAULT_MAX_WAIT);
+//    private int maxActive = GenericObjectPool.DEFAULT_MAX_ACTIVE;
+//    private int maxIdle = GenericObjectPool.DEFAULT_MAX_IDLE;
+//    private int maxWait = (int)Math.min(Integer.MAX_VALUE,
+//        GenericObjectPool.DEFAULT_MAX_WAIT);
     private boolean defaultReadOnly = false;
     /** Description */
     private String description = null;
@@ -117,12 +117,12 @@
     private boolean _testOnBorrow = GenericObjectPool.DEFAULT_TEST_ON_BORROW;
     private boolean _testOnReturn = GenericObjectPool.DEFAULT_TEST_ON_RETURN;
     private int _timeBetweenEvictionRunsMillis = (int)
-        Math.min((long)Integer.MAX_VALUE,
+        Math.min(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,
+    Math.min(Integer.MAX_VALUE,
              GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS);
     private boolean _testWhileIdle = GenericObjectPool.DEFAULT_TEST_WHILE_IDLE;
     private String validationQuery = null;