Bugfix for reference import

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
index 7e95750f77c6bb5267c0861eae20912b12d54080..231266474a3ec64d5fbccce7adc7cb9eb11927d4 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java
@@ -329,6 +329,7 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
                                        Integer inRefFk = rs.getInt("inRefFk");\r
                                        \r
                                        if (inRefFk != null){\r
+                                               \r
                                                Reference<?> thisNomRef = getReferenceOnlyFromMaps(relatedNomReferences, relatedBiblioReferences, String.valueOf(refId));\r
                                                Reference<?> thisBiblioRef = getReferenceOnlyFromMaps(relatedBiblioReferences, relatedNomReferences, String.valueOf(refId));\r
                                                \r
@@ -337,6 +338,9 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
                                                boolean inRefExists = false;\r
                                                if (thisNomRef != null){\r
                                                        Reference<?> inRef = (nomInReference != null)? nomInReference : biblioInReference;\r
+                                                       if (inRef == null){\r
+                                                               logger.warn("No InRef found for nomRef: " + thisNomRef.getTitleCache() + "; RefId: " +  refId + "; inRefFK: " +  inRefFk);\r
+                                                       }\r
                                                        thisNomRef.setInReference(inRef);\r
                                                        nomRefToSave.put(refId, thisNomRef);\r
                                                        //remember that an in reference exists\r
@@ -345,7 +349,10 @@ public class BerlinModelReferenceImport extends BerlinModelImportBase {
                                                        thisNomRef.getTitleCache();\r
                                                }\r
                                                if (thisBiblioRef != null){\r
-                                                       Reference<?> inRef = (biblioInReference != null)? nomInReference : biblioInReference ;\r
+                                                       Reference<?> inRef = (biblioInReference != null)? biblioInReference : nomInReference ;\r
+                                                       if (inRef == null){\r
+                                                               logger.warn("No InRef found for biblioRef: " + thisBiblioRef.getTitleCache() + "; RefId: " +  refId + "; inRefFK: " +  inRefFk);\r
+                                                       }\r
                                                        thisBiblioRef.setInReference(inRef);\r
                                                        biblioRefToSave.put(refId, thisBiblioRef);\r
                                                        //remember that an in reference exists\r