From 62d98fb72bf799d0a8f6f4e163e661f153e3f3d8 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@gmail.com>
Date: Fri, 21 Dec 2012 00:19:49 +0800
Subject: [PATCH] improve WallFilter

---
 src/main/java/com/alibaba/druid/wall/WallConfig.java   | 10 +++++-----
 src/main/java/com/alibaba/druid/wall/WallFilter.java   |  6 +++---
 src/main/java/com/alibaba/druid/wall/WallProvider.java |  2 +-
 .../druid/bvt/filter/wall/DoPrivilegedTest.java        |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/wall/WallConfig.java b/src/main/java/com/alibaba/druid/wall/WallConfig.java
index 300625feb7..3cfb2f23b1 100644
--- a/src/main/java/com/alibaba/druid/wall/WallConfig.java
+++ b/src/main/java/com/alibaba/druid/wall/WallConfig.java
@@ -61,7 +61,7 @@ public class WallConfig implements WallConfigMBean {
 
     private boolean             mustParameterized          = false;
 
-    private boolean             allowDoPrivileged          = false;
+    private boolean             doPrivilegedAllow          = false;
 
     protected final Set<String> permitFunctions            = new HashSet<String>();
     protected final Set<String> permitTables               = new HashSet<String>();
@@ -117,12 +117,12 @@ public class WallConfig implements WallConfigMBean {
         this.wrapAllow = wrapAllow;
     }
 
-    public boolean isAllowDoPrivileged() {
-        return allowDoPrivileged;
+    public boolean isDoPrivilegedAllow() {
+        return doPrivilegedAllow;
     }
 
-    public void setAllowDoPrivileged(boolean allowDoPrivileged) {
-        this.allowDoPrivileged = allowDoPrivileged;
+    public void setDoPrivilegedAllow(boolean doPrivilegedAllow) {
+        this.doPrivilegedAllow = doPrivilegedAllow;
     }
 
     public boolean isSelectAllColumnAllow() {
diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java
index d1b2dd0f8f..105fe339a0 100644
--- a/src/main/java/com/alibaba/druid/wall/WallFilter.java
+++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java
@@ -320,7 +320,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean {
 
     @Override
     public boolean isWrapperFor(FilterChain chain, Wrapper wrapper, Class<?> iface) throws SQLException {
-        if (config.isAllowDoPrivileged() && WallProvider.ispPivileged()) {
+        if (config.isDoPrivilegedAllow() && WallProvider.ispPivileged()) {
             return chain.isWrapperFor(wrapper, iface);
         }
 
@@ -332,7 +332,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean {
 
     @Override
     public <T> T unwrap(FilterChain chain, Wrapper wrapper, Class<T> iface) throws SQLException {
-        if (config.isAllowDoPrivileged() && WallProvider.ispPivileged()) {
+        if (config.isDoPrivilegedAllow() && WallProvider.ispPivileged()) {
             return chain.unwrap(wrapper, iface);
         }
 
@@ -346,7 +346,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean {
 
     @Override
     public DatabaseMetaData connection_getMetaData(FilterChain chain, ConnectionProxy connection) throws SQLException {
-        if (config.isAllowDoPrivileged() && WallProvider.ispPivileged()) {
+        if (config.isDoPrivilegedAllow() && WallProvider.ispPivileged()) {
             return chain.connection_getMetaData(connection);
         }
 
diff --git a/src/main/java/com/alibaba/druid/wall/WallProvider.java b/src/main/java/com/alibaba/druid/wall/WallProvider.java
index e327643629..92a15f36b6 100644
--- a/src/main/java/com/alibaba/druid/wall/WallProvider.java
+++ b/src/main/java/com/alibaba/druid/wall/WallProvider.java
@@ -119,7 +119,7 @@ public abstract class WallProvider {
     public WallCheckResult check(String sql) {
         WallCheckResult result = new WallCheckResult();
 
-        if (config.isAllowDoPrivileged() && privileged.get() == Boolean.TRUE) {
+        if (config.isDoPrivilegedAllow() && ispPivileged()) {
             return result;
         }
 
diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java
index 85724b7aff..0fa2e94f7e 100644
--- a/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java
+++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/DoPrivilegedTest.java
@@ -33,7 +33,7 @@ public class DoPrivilegedTest extends TestCase {
 
     public void test_1() throws Exception {
         final WallConfig config = new WallConfig();
-        config.setAllowDoPrivileged(true);
+        config.setDoPrivilegedAllow(true);
         
         WallProvider.doPrivileged(new PrivilegedAction<Object>() {
             @Override