Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git

Browse Source 
Conflicts:
	src/main/java/com/alibaba/druid/filter/wall/spi/MySqlWallVisitor.java
	src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java
This commit is contained in:
温少
2012-03-17 01:27:47 +08:00
parent 771ca0e577 d3d0a5c193
commit 86e96ad69f
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/wall/WallConfig.java
+3 -1
View File
@@ -30,6 +30,8 @@ public class WallConfig {
protected final Set<String> permitNames = new HashSet<String>();
protected final Set<String> permitObjects = new HashSet<String>();
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");
src/main/java/com/alibaba/druid/filter/wall/spi/OracleWallVisitor.java
+1
View File
@@ -223,6 +223,7 @@ public class OracleWallVisitor extends OracleASTVIsitorAdapter implements WallVi
}
WallVisitorUtils.checkUpdateCondition(this, x.getWhere());
return true;
}
}