Conflicts:
	src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
This commit is contained in:
温少
2012-03-22 19:59:30 +08:00
@@ -138,7 +138,7 @@ public class WallVisitorUtils {
addViolation(visitor, x);
return;
}
checkCondition(visitor, x.getWhere());
}
@@ -146,11 +146,11 @@ public class WallVisitorUtils {
if (x == null) {
return;
}
if (visitor.getConfig().isMustParameterized()) {
ExportParameterVisitor exportParameterVisitor = visitor.getProvider().createExportParameterVisitor();
x.accept(exportParameterVisitor);
if (exportParameterVisitor.getParameters().size() > 0) {
addViolation(visitor, x);
return;
@@ -194,7 +194,7 @@ public class WallVisitorUtils {
if (x.getWhere() == null || Boolean.TRUE == getValue(x.getWhere())) {
addViolation(visitor, x);
return;
return;
}
checkCondition(visitor, x.getWhere());