bugfix for protected name title caches in BM import

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java
index 07a9c3ea6db1bb70499555f421f4b9f2d9fbc039..6778862a303983a75fb67f921d61a63ce434b75e 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java
@@ -134,8 +134,8 @@ public class BerlinModelTaxonNameRelationImport extends BerlinModelImportBase {
                                int relQualifierFk = rs.getInt("relNameQualifierFk");\r
                                String notes = rs.getString("notes");\r
                                \r
-                               TaxonNameBase nameFrom = nameMap.get(String.valueOf(name1Id));\r
-                               TaxonNameBase nameTo = nameMap.get(String.valueOf(name2Id));\r
+                               TaxonNameBase<?,?> nameFrom = nameMap.get(String.valueOf(name1Id));\r
+                               TaxonNameBase<?,?> nameTo = nameMap.get(String.valueOf(name2Id));\r
                                \r
                                \r
                                Reference<?> citation = null;\r
@@ -153,10 +153,15 @@ public class BerlinModelTaxonNameRelationImport extends BerlinModelImportBase {
                                if (nameFrom != null && nameTo != null){\r
                                        success = handleNameRelationship(success, config, name1Id, name2Id,     relQualifierFk, \r
                                                        notes, nameFrom, nameTo, citation, microcitation, rule);\r
-                                       nameFrom.setTitleCache(null);\r
-                                       nameTo.setTitleCache(null);\r
-                                       nameFrom.getTitleCache();\r
-                                       nameTo.getTitleCache();\r
+                                       \r
+                                       if (! nameFrom.isProtectedTitleCache()){\r
+                                               nameFrom.setTitleCache(null);\r
+                                               nameFrom.getTitleCache();\r
+                                       }\r
+                                       if (! nameTo.isProtectedTitleCache()){\r
+                                               nameTo.setTitleCache(null);\r
+                                               nameTo.getTitleCache();\r
+                                       }\r
                                        nameToSave.add(nameFrom);\r
                                        \r
                                        //TODO\r