ref #8517 handle protected fieldunit titlecache in DerivedUnitFacadeFieldUnitCacheStr...

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategy.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategy.java
index dbea16a8279ab22999802e9c46e0d1c02756d098..009ca865c6fbe000cafd77c08e95737f17ac767f 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategy.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategy.java
@@ -58,14 +58,9 @@ public class DerivedUnitFacadeCacheStrategy
                        config.setFirePropertyChangeEvents(false);
                        facade = DerivedUnitFacade.NewInstance(derivedUnit, config);
 
-                       FieldUnit fieldUnit = facade.getFieldUnit(false);
-                       if(!skipFieldUnit && fieldUnit != null){
-                           if(fieldUnit.isProtectedTitleCache()){
-                               result += fieldUnit.getTitleCache();
-                           } else {
-                               result += fieldStrategy.getFieldData(facade);
-                           }
-                       }
+               if(!skipFieldUnit){
+                       result += fieldStrategy.getFieldData(facade);
+
                        //Exsiccatum
                        String exsiccatum = null;
                        try {

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java
index 2b97427ee6be150eeb7a08edee13f3b7026f76be..2f91352dcab4969da908bf81ef0455fef9e2e5c3 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java
@@ -64,6 +64,12 @@ public class DerivedUnitFacadeFieldUnitCacheStrategy
        }
 
        protected String getFieldData(DerivedUnitFacade facade) {
+
+           FieldUnit fieldUnit = facade.getFieldUnit(false);
+           if (fieldUnit != null && fieldUnit.isProtectedTitleCache()){
+               return fieldUnit.getTitleCache();
+           }
+
                String ALTITUDE_PREFIX = "alt. ";
 //             String ALTITUDE_POSTFIX = " m";