add testcase & bug fixed

This commit is contained in:
wenshao
2012-08-25 07:58:45 +08:00
parent 78550243b2
commit dcfdf5449e
16 changed files with 532 additions and 9 deletions
@@ -1297,7 +1297,10 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
}
public void initPhysicalConnection(Connection conn) throws SQLException {
conn.setAutoCommit(isDefaultAutoCommit());
if (conn.getAutoCommit() != defaultAutoCommit) {
conn.setAutoCommit(defaultAutoCommit);
}
if (getDefaultReadOnly() != null) {
if (conn.isReadOnly() != getDefaultReadOnly()) {
conn.setReadOnly(getDefaultReadOnly());
@@ -347,7 +347,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
if (getInitialSize() > maxActive) {
throw new IllegalArgumentException("illegal initialSize");
throw new IllegalArgumentException("illegal initialSize " + this.initialSize + ", maxActieve " + maxActive);
}
if (this.driverClass != null) {
@@ -402,9 +402,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
// 初始化连接
for (int i = 0, size = getInitialSize(); i < size; ++i) {
Connection conn = createPhysicalConnection();
if (defaultAutoCommit != conn.getAutoCommit()) {
conn.setAutoCommit(defaultAutoCommit);
}
connections[poolingCount++] = new DruidConnectionHolder(this, conn);
}