From 95b7631c03f6dc2eeeabe025df1d7b3d5b359890 Mon Sep 17 00:00:00 2001
From: kiki <kiki@Mars.(none)>
Date: Fri, 15 Nov 2013 15:46:53 +0800
Subject: [PATCH 1/2] improve sql wall

---
 .../java/com/alibaba/druid/wall/spi/WallVisitorUtils.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
index 2b47abb0c1..9f24e1a124 100644
--- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
@@ -794,6 +794,14 @@ public class WallVisitorUtils {
                 return false;
             }
 
+            if (parent instanceof SQLJoinTableSource) {
+                SQLJoinTableSource joinTableSource = (SQLJoinTableSource) parent;
+                if (joinTableSource.getCondition() == x) {
+                    return true;
+                }
+
+            }
+
             if (parent instanceof SQLUnionQuery) {
                 SQLUnionQuery union = (SQLUnionQuery) parent;
                 if (union.getRight() == x && hasWhere(union.getLeft())) {

From dee930814fe7ee86fad5be312bce331affc0fc0b Mon Sep 17 00:00:00 2001
From: kiki <kiki@Mars.(none)>
Date: Tue, 26 Nov 2013 10:28:10 +0800
Subject: [PATCH 2/2] fix datasource bug

---
 pom.xml                                                   | 2 +-
 src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 711d1b0dc9..e039c3ac0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   
 	<groupId>com.alibaba</groupId>
 	<artifactId>druid</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 
 	<packaging>jar</packaging>
 	<name>druid</name>
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index db710504ed..0d291cc9a1 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -1065,7 +1065,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
             String errorMessage = buf.toString();
 
-            if (this.createError == null) {
+            if (this.createError != null) {
                 throw new GetConnectionTimeoutException(errorMessage, createError);
             } else {
                 throw new GetConnectionTimeoutException(errorMessage);