Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

删除无用代码

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@559 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-09-02 02:21:56 +00:00
parent 2af748f7be
commit 2de8153596
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+4 -6
View File
@@ -358,7 +358,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
*/
protected void recycle(PoolableConnection pooledConnection) throws SQLException {
final Connection conn = pooledConnection.getConnection();
ConnectionHolder holder = pooledConnection.getConnectionHolder();
final ConnectionHolder holder = pooledConnection.getConnectionHolder();
assert holder != null;
@@ -375,8 +375,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
return;
}
boolean isAutoCommit = conn.getAutoCommit();
boolean isReadOnly = conn.isReadOnly();
final boolean isAutoCommit = conn.getAutoCommit();
final boolean isReadOnly = conn.isReadOnly();
// 第二步，检查是否需要回滚
if ((!isAutoCommit) && (!isReadOnly)) {
@@ -715,8 +715,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
continue;
}
int evictCount = 0;
int idleCount = 0;
lock.lock();
try {
int numTestsPerEvictionRun = DruidDataSource.this.numTestsPerEvictionRun;
@@ -731,7 +729,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
ConnectionHolder connection = connections[i];
if (evictCount == 0 && idleCount == 0 && connection == null) {
if (connection == null) {
continue FOR_0;
}