From 2de8153596121d0ab9da02067044bcb4ad37a169 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 2 Sep 2011 02:21:56 +0000 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://code.alibabatech.com/svn/druid/trunk@559 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../java/com/alibaba/druid/pool/DruidDataSource.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index e667ddb387..d8f4a4c6ea 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -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; }