bug fixed

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@699 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-09-09 11:07:06 +00:00
parent d56263cbc8
commit ff77d06204
3 changed files with 7 additions and 5 deletions
@@ -845,7 +845,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
buf.append("\n");
}
LOG.warn(buf.toString());
LOG.error(buf.toString());
}
}
}
@@ -107,11 +107,13 @@ public class PoolableConnection implements PooledConnection, Connection {
@Override
public void close() throws SQLException {
ConnectionHolder holder = this.holder;
if (holder == null) {
LOG.warn("dup close");
LOG.error("dup close");
return;
}
DruidAbstractDataSource dataSource = holder.getDataSource();
if (dataSource.isRemoveAbandoned()) {
dataSource.removeActiveConnection(this);
@@ -133,7 +135,7 @@ public class PoolableConnection implements PooledConnection, Connection {
holder.reset();
holder.getDataSource().recycle(this);
holder = null;
this.holder = null;
conn = null;
}
@@ -71,8 +71,8 @@ public final class PoolableResultSet extends PoolableWrapper implements ResultSe
@Override
public void close() throws SQLException {
try {
rs.close();
this.closed = true;
rs.close();
} catch (Throwable t) {
throw checkException(t);
}