From f5083397028726bba59b493d7c9a2cc52a7c7d77 Mon Sep 17 00:00:00 2001
From: wenshao <wenshao@wenshao-ubuntu-001.(none)>
Date: Thu, 6 Dec 2012 15:01:12 +0800
Subject: [PATCH] bug fixed wall filter & licence info

---
 .../ast/clause/OracleWithSubqueryEntry.java       | 15 +++++++++++++++
 .../java/com/alibaba/druid/wall/WallFilter.java   |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleWithSubqueryEntry.java b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleWithSubqueryEntry.java
index 4705de774a..461e700d75 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleWithSubqueryEntry.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/oracle/ast/clause/OracleWithSubqueryEntry.java
@@ -5,6 +5,21 @@ import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject;
 import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
 import com.alibaba.druid.sql.visitor.SQLASTVisitor;
 
+/*
+ * 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.
+ */
 public class OracleWithSubqueryEntry extends Entry implements OracleSQLObject {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java
index a5e5638261..c4dd49d413 100644
--- a/src/main/java/com/alibaba/druid/wall/WallFilter.java
+++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java
@@ -55,7 +55,11 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean {
     @Override
     public void init(DataSourceProxy dataSource) {
         if (this.dbType == null || this.dbType.trim().length() == 0) {
-            this.dbType = JdbcUtils.getDbType(dataSource.getRawJdbcUrl(), "");
+            if (dataSource != null && dataSource.getDbType() != null) {
+                this.dbType = dataSource.getDbType();
+            } else {
+                this.dbType = JdbcUtils.getDbType(dataSource.getRawJdbcUrl(), "");
+            }
         }
         
         if (dbType == null) {