diff --git a/src/main/java/com/alibaba/druid/filter/wall/WallConfig.java b/src/main/java/com/alibaba/druid/filter/wall/WallConfig.java index b4e9e67c79..8981e74019 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/WallConfig.java +++ b/src/main/java/com/alibaba/druid/filter/wall/WallConfig.java @@ -30,6 +30,8 @@ public class WallConfig { protected final Set permitNames = new HashSet(); protected final Set permitObjects = new HashSet(); + + public void loadDefault(String dir) { if (dir.endsWith("/")) { dir = dir.substring(0, dir.length() - 1); @@ -45,7 +47,7 @@ public class WallConfig { if (dir.endsWith("/")) { dir = dir.substring(0, dir.length() - 1); } - + loadResource(getPermitNames(), dir + "permit-name.txt"); loadResource(getPermitSchemas(), dir + "permit-schema.txt"); loadResource(getPermitFunctions(), dir + "permit-function.txt"); diff --git a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java b/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java index 4f8c95cfac..9f5d2a9f8a 100644 --- a/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java +++ b/src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java @@ -223,6 +223,7 @@ public class OracleWallVisitor extends OracleASTVIsitorAdapter implements WallVi } WallVisitorUtils.checkUpdateCondition(this, x.getWhere()); + return true; } }