bug fixed for removeAbandonded concurrent problem

src/test/java/com/alibaba/druid/bvt/pool/TestRemoveAbandoned2.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.bvt.pool;
+
+import java.sql.Connection;
+import java.util.concurrent.atomic.AtomicLong;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.druid.mock.MockDriver;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.DruidPooledConnection;
+import com.alibaba.druid.stat.DruidDataSourceStatManager;
+
+public class TestRemoveAbandoned2 extends TestCase {
+
+    private MockDriver      driver;
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        driver = new MockDriver();
+
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setDriver(driver);
+        dataSource.setInitialSize(1);
+        dataSource.setMaxActive(2);
+        dataSource.setMaxIdle(2);
+        dataSource.setMinIdle(1);
+        dataSource.setMinEvictableIdleTimeMillis(300 * 1000); // 300 / 10
+        dataSource.setTimeBetweenEvictionRunsMillis(1000 * 300); // 180 / 10
+        dataSource.setRemoveAbandoned(true);
+        dataSource.setRemoveAbandonedTimeoutMillis(0);
+        dataSource.setTestWhileIdle(true);
+        dataSource.setTestOnBorrow(false);
+        dataSource.setValidationQuery("SELECT 1");
+        dataSource.setFilters("stat");
+
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+        Assert.assertEquals(0, DruidDataSourceStatManager.getInstance().getDataSourceList().size());
+    }
+
+    public void test_removeAbandoned() throws Exception {
+        {
+            Connection conn = dataSource.getConnection();
+            conn.close();
+        }
+        Assert.assertEquals(0, dataSource.getActiveCount());
+        
+
+        Thread abandonThread = new Thread("abandoned") {
+
+            public void run() {
+                for (;;) {
+                    dataSource.removeAbandoned();
+                    if (Thread.interrupted()) {
+                        break;
+                    }
+                }
+            }
+        };
+
+        abandonThread.start();
+
+        for (int i = 0; i < 1000 * 100; ++i) {
+            DruidPooledConnection conn = dataSource.getConnection();
+            conn.close();
+        }
+        Assert.assertEquals(0, dataSource.getActiveCount());
+        abandonThread.interrupt();
+        
+        System.out.println("removeAbandondedCount : " + dataSource.getRemoveAbandonedCount());
+    }
+}