ref #8096: smaller changes for update caches

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
index 1abbcb3d4e88abc2c15dca01a66ddd84e1424285..ba12a565f9a05624130f9f1d6f9d98287808b682 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java
@@ -3626,7 +3626,7 @@ public class TaxonName
     private boolean updateFullTitleCache() {
         if (protectedFullTitleCache == false){
             String oldCache = this.fullTitleCache;
-            String newCache = cacheStrategy.getFullTitleCache(this);
+            String newCache = getTruncatedCache(cacheStrategy.getFullTitleCache(this));
             if (!CdmUtils.nullSafeEqual(oldCache, newCache)){
                 this.setFullTitleCache(null, false);
                 this.getFullTitleCache();

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
index 8865603b106c818ffd5df602215fd6d770462ec5..7457cf58bbcf682a34c9a221b9e7c549190821c3 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java
@@ -1175,7 +1175,10 @@ public class Reference
        if (this.protectedAbbrevTitleCache == false){
            String oldAbbrevTitleCache = this.abbrevTitleCache;
 
-           String newAbbrevTitleCache = cacheStrategy.getFullAbbrevTitleString(this);
+           String newAbbrevTitleCache = getTruncatedCache(cacheStrategy.getFullAbbrevTitleString(this));
+           if (newAbbrevTitleCache.equals("")){
+               newAbbrevTitleCache = cacheStrategy.getTitleCache(this);
+           }
 
            if ( oldAbbrevTitleCache == null   || ! oldAbbrevTitleCache.equals(newAbbrevTitleCache) ){
                 this.setAbbrevTitleCache(null, false);