Merge pull request #736 from wenshao/master

并发优化

src/main/java/com/alibaba/druid/pool/DruidDataSource.java

@@ -1035,12 +1035,7 @@ public class DruidDataSource extends DruidAbstractDataSource
     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 @@ public class DruidDataSource extends DruidAbstractDataSource
 
                     destroyCount.incrementAndGet();
 
-                    lock.lockInterruptibly();
+                    lock.lock();
                     try {
                         activeCount--;
                         closeCount++;
@@ -1996,6 +1991,12 @@ public class DruidDataSource extends DruidAbstractDataSource
 
         if (abandonedList.size() > 0) {
             for (DruidPooledConnection pooledConnection : abandonedList) {
+                synchronized (pooledConnection) {
+                    if (pooledConnection.isDisable()) {
+                        continue;
+                    }
+                }
+                
                 JdbcUtils.close(pooledConnection);
                 pooledConnection.abandond();
                 removeAbandonedCount++;

src/main/java/com/alibaba/druid/util/OracleUtils.java

@@ -134,10 +134,9 @@ public class OracleUtils {
         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 {