test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

PL-8851 NPE occurs when the Join-section of a custom filter specified incorrectly

Browse Source
This commit is contained in:
Andrey Subbotin 2017-03-30 13:26:36 +04:00
parent c3fe2e1159
commit c75cf76860
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/global/src/com/haulmont/cuba/core/sys/jpql/Parser.java
View File

@ -54,6 +54,11 @@ public class Parser {
JPA2Parser parser = createParser(join);
JPA2Parser.join_section_return aReturn = parser.join_section();
CommonTree tree = (CommonTree) aReturn.getTree();
if (tree == null) {
parser = createParser("join " + join);
aReturn = parser.join_section();
tree = (CommonTree) aReturn.getTree();
}
if (tree instanceof JoinVariableNode) {
checkTreeForExceptions(join, tree);
return Collections.singletonList((JoinVariableNode) tree);
@ -62,7 +67,7 @@ public class Parser {
.filter(node -> node instanceof JoinVariableNode)
.map(JoinVariableNode.class::cast)
.collect(Collectors.toList());
joins.stream().forEach(node -> checkTreeForExceptions(join, tree));
checkTreeForExceptions(join, tree);
return joins;
}
}