Merge pull request alibaba#475 from cutedemons/master

improve sql wall & fix datasource bug
buddygjw · Nov 26, 2013 · 24382e7 · 24382e7
2 parents 188ff78 + dee9308
commit 24382e7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -1065,7 +1065,7 @@ private DruidPooledConnection getConnectionInternal(long maxWait) throws SQLExce
 
             String errorMessage = buf.toString();
 
-            if (this.createError == null) {
+            if (this.createError != null) {
                 throw new GetConnectionTimeoutException(errorMessage, createError);
             } else {
                 throw new GetConnectionTimeoutException(errorMessage);

diff --git 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 static boolean isWhereOrHaving(SQLObject x) {
                 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())) {