Repository: cayenne Updated Branches: refs/heads/master 739d02ed5 -> 87d7e89b9
Fix NPE Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/bd8f5c00 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/bd8f5c00 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/bd8f5c00 Branch: refs/heads/master Commit: bd8f5c0013d8976507f946d4fa60018ba6fe6e3a Parents: 739d02e Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Mar 7 15:00:13 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Mar 7 15:00:13 2018 +0300 ---------------------------------------------------------------------- .../access/translator/select/DefaultSelectTranslator.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/bd8f5c00/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java index b391a16..b48329e 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/DefaultSelectTranslator.java @@ -261,6 +261,10 @@ public class DefaultSelectTranslator extends QueryAssembler implements SelectTra * Warn user in case query uses both limit and joint prefetch, as we don't support this combination. */ private void checkLimitAndJointPrefetch() { + if(queryMetadata.getPrefetchTree() == null) { + return; + } + if(queryMetadata.getFetchLimit() == 0 && queryMetadata.getFetchOffset() == 0) { return; }
