You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/03/21 13:28:37 UTC

[3/4] cayenne git commit: Fix NPE

Fix NPE


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/237c1421
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/237c1421
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/237c1421

Branch: refs/heads/STABLE-4.0
Commit: 237c142102f32ed805cf52d909054f05a1410958
Parents: 26330d4
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Mar 21 16:12:03 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Mar 21 16:12:03 2018 +0300

----------------------------------------------------------------------
 .../cayenne/access/translator/select/DefaultSelectTranslator.java | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/237c1421/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 d933a39..7297fc6 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
@@ -958,6 +958,9 @@ public class DefaultSelectTranslator extends QueryAssembler implements SelectTra
 		}
 
 		public boolean haveJointNode(PrefetchTreeNode prefetchTree) {
+			if(prefetchTree == null) {
+				return false;
+			}
 			haveJointNode = false;
 			prefetchTree.traverse(this);
 			return haveJointNode;