# HG changeset patch
# User Robert Casties <casties@mpiwg-berlin.mpg.de>
# Date 1497620670 -7200
# Node ID 15c26735fff7e16430c979450a7cb92fc4289215
# Parent  3c585df9f87459bb486979c936855ae5ced47eff
fix some NPEs with ImportMerge.

diff -r 3c585df9f874 -r 15c26735fff7 src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java
--- a/src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java	Tue Apr 04 17:43:51 2017 +0200
+++ b/src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java	Fri Jun 16 15:44:30 2017 +0200
@@ -348,7 +348,7 @@
                 firstAttMap.put(att.getName(), att.getValue());
                 if (!attLabels.contains(att.getName())) {
                     attLabels.add(att.getName());
-                    selectedAtts.put(att.getName(), FIRST_VALUE);
+                    selectedAtts.put(att.getName(), SECOND_VALUE);
                 }
             }
 
@@ -356,7 +356,7 @@
                 secondAttMap.put(att.getName(), att.getValue());
                 if (!attLabels.contains(att.getName())) {
                     attLabels.add(att.getName());
-                    selectedAtts.put(att.getName(), FIRST_VALUE);
+                    selectedAtts.put(att.getName(), SECOND_VALUE);
                 }
             }
 
@@ -372,8 +372,13 @@
             }
 
             for (Relation rel : this.secondEntity.getSourceRelations()) {
-                rel.setTarget(getWrapper().getEntityById(rel.getTargetId()));
-                selectedSecondSrcRelations.put(rel.getId(), TAKE);
+            	rel.setTarget(getWrapper().getEntityById(rel.getTargetId()));
+            	if (rel.getTarget() != null) {
+                	selectedSecondSrcRelations.put(rel.getId(), TAKE);
+                } else {
+                	logger.error("source relation to merge has nonexistent target: "+rel);
+                	selectedSecondSrcRelations.put(rel.getId(), IGNORE);
+                }
             }
 
             /*
@@ -388,8 +393,13 @@
             }
 
             for (Relation rel : this.secondEntity.getTargetRelations()) {
-                rel.setSource(getWrapper().getEntityById(rel.getSourceId()));
-                selectedSecondTarRelations.put(rel.getId(), TAKE);
+            	rel.setSource(getWrapper().getEntityById(rel.getSourceId()));
+            	if (rel.getSource() != null) {
+					selectedSecondTarRelations.put(rel.getId(), TAKE);
+				} else {
+					logger.error("target relation to merge has nonexistent source: " + rel);
+					selectedSecondTarRelations.put(rel.getId(), IGNORE);
+				}
             }
 
         }