You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/15 17:15:55 UTC

cayenne git commit: trying to debug sorter NPE

Repository: cayenne
Updated Branches:
  refs/heads/master 84f7f2dfa -> fb4db81d2


trying to debug sorter NPE


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

Branch: refs/heads/master
Commit: fb4db81d2808b2baced1d0a1417ce3e8cdc0435e
Parents: 84f7f2d
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Thu Dec 15 20:14:54 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Thu Dec 15 20:14:54 2016 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/ashwood/AshwoodEntitySorter.java     | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/fb4db81d/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java b/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
index a2b4077..1f3a16c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
@@ -363,6 +363,15 @@ public class AshwoodEntitySorter implements EntitySorter {
 			else {
 				ComponentRecord rec1 = components.get(t1);
 				ComponentRecord rec2 = components.get(t2);
+
+				if(rec1 == null) {
+					throw new NullPointerException("No record for DbEntity: " + t1);
+				}
+
+				if(rec2 == null) {
+					throw new NullPointerException("No record for DbEntity: " + t2);
+				}
+
 				int index1 = rec1.index;
 				int index2 = rec2.index;