Merge pull request #90 from wenshao/master

DruidDataSource初始化检查是去掉无用的maxIdle检测
This commit is contained in:
温高铁
2012-08-26 22:49:33 -07:00
2 changed files with 1 additions and 11 deletions
@@ -343,10 +343,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
throw new IllegalArgumentException("illegal maxActive " + maxActive);
}
if (maxIdle <= 0 || maxIdle < minIdle) {
throw new IllegalArgumentException("illegal maxPoolSize");
}
if (getInitialSize() > maxActive) {
throw new IllegalArgumentException("illegal initialSize " + this.initialSize + ", maxActieve "
+ maxActive);
@@ -103,13 +103,7 @@ public class ParamTest extends TestCase {
Assert.assertEquals(1, dataSource.getProxyFilters().size());
error = null;
try {
dataSource.getConnection();
} catch (Exception ex) {
error = ex;
}
Assert.assertNotNull(error);
dataSource.getConnection();
dataSource.close();
}