From: Andreas Müller <a.mueller@bgbm.org>
Date: Tue, 22 May 2012 11:54:24 +0000 (+0000)
Subject: bugfix for protected name title caches in BM import
X-Git-Tag: cdmlib-parent-3.0.11~92
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/567c60b236ac60b43c3ee6e817be20e26b716e8e?hp=ae151cec320ee2fb39702da448def45bb4c1b950

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 07a9c3ea6d..6778862a30 100644
--- 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");
 				String notes = rs.getString("notes");
 				
-				TaxonNameBase nameFrom = nameMap.get(String.valueOf(name1Id));
-				TaxonNameBase nameTo = nameMap.get(String.valueOf(name2Id));
+				TaxonNameBase<?,?> nameFrom = nameMap.get(String.valueOf(name1Id));
+				TaxonNameBase<?,?> nameTo = nameMap.get(String.valueOf(name2Id));
 				
 				
 				Reference<?> citation = null;
@@ -153,10 +153,15 @@ public class BerlinModelTaxonNameRelationImport extends BerlinModelImportBase {
 				if (nameFrom != null && nameTo != null){
 					success = handleNameRelationship(success, config, name1Id, name2Id,	relQualifierFk, 
 							notes, nameFrom, nameTo, citation, microcitation, rule);
-					nameFrom.setTitleCache(null);
-					nameTo.setTitleCache(null);
-					nameFrom.getTitleCache();
-					nameTo.getTitleCache();
+					
+					if (! nameFrom.isProtectedTitleCache()){
+						nameFrom.setTitleCache(null);
+						nameFrom.getTitleCache();
+					}
+					if (! nameTo.isProtectedTitleCache()){
+						nameTo.setTitleCache(null);
+						nameTo.getTitleCache();
+					}
 					nameToSave.add(nameFrom);
 					
 					//TODO