Merge pull request #50 from wenshao/master

修正不能够Graceshutdown的问题

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

@@ -955,6 +955,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     notEmptyWaitThreadCount--;
                 }
                 notEmptyWaitCount++;
+                
+                if (!enable) {
+                    connectErrorCount.incrementAndGet();
+                    throw new DataSourceDisableException();
+                }
             }
         } catch (InterruptedException ie) {
             notEmpty.signal(); // propagate to non-interrupted thread
@@ -993,6 +998,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                                                               // creator
                     notEmptyWaitCount++;
                     notEmptyWaitNanos += (startEstimate - estimate);
+                    
+                    if (!enable) {
+                        connectErrorCount.incrementAndGet();
+                        throw new DataSourceDisableException();
+                    }
                 } catch (InterruptedException ie) {
                     notEmpty.signal(); // propagate to non-interrupted thread
                     notEmptySignalCount++;

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

@@ -17,6 +17,7 @@ package com.alibaba.druid.bvt.pool;
 
 import java.sql.Connection;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -91,6 +92,6 @@ public class TestGraceShutdown extends TestCase {
             }
         }.start();
 
-        endLatch.await();
+        Assert.assertTrue(endLatch.await(60, TimeUnit.SECONDS));
     }
 }