mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
Merge branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git
Conflicts: src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
This commit is contained in:
@@ -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());
|
||||
|
||||
Reference in New Issue
Block a user