async close support

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

@@ -1169,6 +1169,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 
                 if (requireDiscard) {
                     this.discardConnection(holder.getConnection());
+                    holder.setDiscard(true);
                 }
                 
                 LOG.error("discard connection", sqlEx);
@@ -1225,7 +1226,18 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             }
 
             // reset holder, restore default settings, clear warnings
-            holder.reset();
+            boolean isSameThread = pooledConnection.getOwnerThread() == Thread.currentThread();
+            if (!isSameThread) {
+                synchronized (pooledConnection) {
+                    holder.reset();
+                }
+            } else {
+                holder.reset();
+            }
+            
+            if (holder.isDiscard()) {
+                return;
+            }
 
             if (testOnReturn) {
                 boolean validate = testConnectionInternal(physicalConnection);

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

@@ -217,7 +217,14 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
             return;
         }
 
-        if (holder.getDataSource().isAsyncCloseConnectionEnable()) {
+        DruidAbstractDataSource dataSource = holder.getDataSource();
+        boolean isSameThread = this.getOwnerThread() == Thread.currentThread();
+        
+        if (!isSameThread) {
+            dataSource.setAsyncCloseConnectionEnable(true);
+        }
+        
+        if (dataSource.isAsyncCloseConnectionEnable()) {
             syncClose();
             return;
         }
@@ -226,7 +233,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
             listener.connectionClosed(new ConnectionEvent(this));
         }
 
-        DruidAbstractDataSource dataSource = holder.getDataSource();
+        
         List<Filter> filters = dataSource.getProxyFilters();
         if (filters.size() > 0) {
             FilterChainImpl filterChain = new FilterChainImpl(dataSource);