Repository: cayenne Updated Branches: refs/heads/master 37b1ea9b1 -> c93531476
Fix NPE Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c9353147 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c9353147 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c9353147 Branch: refs/heads/master Commit: c93531476d70e4236ed6e67f87442543db2420d0 Parents: 37b1ea9 Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu Sep 20 17:08:08 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu Sep 20 17:08:08 2018 +0300 ---------------------------------------------------------------------- .../cayenne/modeler/util/DbRelationshipPathComboBoxEditor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/c9353147/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbRelationshipPathComboBoxEditor.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbRelationshipPathComboBoxEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbRelationshipPathComboBoxEditor.java index b79e68d..1ad5683 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbRelationshipPathComboBoxEditor.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/DbRelationshipPathComboBoxEditor.java @@ -100,7 +100,7 @@ public class DbRelationshipPathComboBoxEditor extends PathChooserComboBoxCellEdi //we need object target to save it in model DbEntity lastEntity = ((DbRelationship) currentNode).getTargetEntity(); - if(lastEntity == null) { + if(lastEntity != null) { Collection<ObjEntity> objEntities = ((DbRelationship) currentNode).getTargetEntity(). getDataMap().getMappedEntities(lastEntity); ObjEntity objectTarget = objEntities.isEmpty() ? null : objEntities.iterator().next();
