Merge pull request alibaba#736 from wenshao/master

并发优化
zgpxiong · Dec 5, 2014 · d05f635 · d05f635
2 parents ab6e349 + 55d238e
commit d05f635
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -1035,12 +1035,7 @@ public DruidPooledConnection getConnectionDirect(long maxWaitMillis) throws SQLE
     public void discardConnection(Connection realConnection) {
         JdbcUtils.close(realConnection);
 
-        try {
-            lock.lockInterruptibly();
-        } catch (InterruptedException e) {
-            LOG.error("interrupt");
-            return;
-        }
+        lock.lock();
         try {
             activeCount--;
             discardCount++;
@@ -1263,7 +1258,7 @@ protected void recycle(DruidPooledConnection pooledConnection) throws SQLExcepti
 
                     destroyCount.incrementAndGet();
 
-                    lock.lockInterruptibly();
+                    lock.lock();
                     try {
                         activeCount--;
                         closeCount++;
@@ -1996,6 +1991,12 @@ public int removeAbandoned() {
 
         if (abandonedList.size() > 0) {
             for (DruidPooledConnection pooledConnection : abandonedList) {
+                synchronized (pooledConnection) {
+                    if (pooledConnection.isDisable()) {
+                        continue;
+                    }
+                }
+
                 JdbcUtils.close(pooledConnection);
                 pooledConnection.abandond();
                 removeAbandonedCount++;

diff --git a/src/main/java/com/alibaba/druid/util/OracleUtils.java b/src/main/java/com/alibaba/druid/util/OracleUtils.java
@@ -134,10 +134,9 @@ public static void setStatementCacheSize(Connection conn, int size) throws SQLEx
         oracleConn.setStatementCacheSize(size);
     }
 
-    @SuppressWarnings("deprecation")
     public static int pingDatabase(Connection conn) throws SQLException {
         OracleConnection oracleConn = unwrap(conn);
-        return oracleConn.pingDatabase(1000);
+        return oracleConn.pingDatabase();
     }
 
     public static void openProxySession(Connection conn, int type, java.util.Properties prop) throws SQLException {