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/10/01 15:04:00 UTC
[5/6] 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/467371da
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/467371da
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/467371da
Branch: refs/heads/STABLE-4.0
Commit: 467371da96b0e2de1eff1bf97aad7c7fdd3ab0a3
Parents: 50668a4
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Sep 20 17:08:08 2018 +0300
Committer: Arseni Bulatski <an...@gmail.com>
Committed: Tue Sep 25 12:41:24 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/467371da/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();