Mercurial > hg > ismi-richfaces

changeset 115:2b77751e4021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 8e3f1f81acfb6c83c40d922e0a1898bbc04be233
author casties
date Tue, 20 Dec 2016 12:26:20 +0100
parents 363ff8844b23 (diff) 8e3f1f81acfb (current diff)
children ca36b24a22f7
files src/main/java/de/mpiwg/itgroup/ismi/entry/beans/AbstractISMIBean.java
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/AbstractISMIBean.java	Wed Dec 14 15:29:05 2016 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/AbstractISMIBean.java	Tue Dec 20 12:26:20 2016 +0100
@@ -1085,11 +1085,14 @@
      */
     protected void replaceAliasSourceRelation(Entity ent, AliasListenerObject lo, String targetClass, String relName, String aliasRelName) {
         Entity target = lo.entity;
-        if (target != null && target.getObjectClass().equals(targetClass)) {
+        if (target == null || target.getObjectClass() == null) {
+            return;
+        }
+        if (target.getObjectClass().equals(targetClass)) {
             // regular target entity e.g. PLACE
             ent.replaceSourceRelation(target, targetClass, relName);
             ent.removeAllSourceRelationsByName(aliasRelName);
-        } else if (target != null && target.getObjectClass().equals(ALIAS)) {
+        } else if (target.getObjectClass().equals(ALIAS)) {
             // e.g. WITNESS -> was_created_in_as -> ALIAS
             ent.replaceSourceRelation(target, ALIAS, aliasRelName);
             // ALIAS -> is_alias_name_of -> PLACE