remove doubful ? from protected taxon titleCaches

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategy.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategy.java
index 2a41b338d6bed20fb1b42aa45313e0397b07d950..460aab70a51e22fc14e6c2fbd97da79ecb545d20 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategy.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategy.java
@@ -54,39 +54,40 @@ public class TaxonBaseDefaultCacheStrategy<T extends TaxonBase>
 
         List<TaggedText> tags = new ArrayList<>();
 
-        if (taxonBase.isDoubtful()){
-            tags.add(new TaggedText(TagEnum.separator, "?"));
-        }
         if (taxonBase.isProtectedTitleCache()){
             //protected title cache
             tags.add(new TaggedText(TagEnum.name, taxonBase.getTitleCache()));
-        }else{
-            //name
-            List<TaggedText> nameTags = getNameTags(taxonBase);
+            return tags;
+        }
 
-            if (nameTags.size() > 0){
-                tags.addAll(nameTags);
-            }else{
-                tags.add(new TaggedText(TagEnum.fullName, "???"));
-            }
+        if (taxonBase.isDoubtful()){
+            tags.add(new TaggedText(TagEnum.separator, "?"));
+        }
+        //name
+        List<TaggedText> nameTags = getNameTags(taxonBase);
+
+        if (nameTags.size() > 0){
+            tags.addAll(nameTags);
+        }else{
+            tags.add(new TaggedText(TagEnum.fullName, "???"));
+        }
 
-            boolean isSynonym = taxonBase.isInstanceOf(Synonym.class);
-            String secSeparator =  (isSynonym? " syn." : "") + " sec. ";
-            //not used: we currently use a post-separator in the name tags
+        boolean isSynonym = taxonBase.isInstanceOf(Synonym.class);
+        String secSeparator =  (isSynonym? " syn." : "") + " sec. ";
+        //not used: we currently use a post-separator in the name tags
 //                if (nameTags.get(nameTags.size() - 1).getType().equals(TagEnum.nomStatus)){
 //                    secSeparator = "," + secSeparator;
 //                }
 
-            //ref.
-            List<TaggedText> secTags = getSecundumTags(taxonBase);
-
-            //sec.
-            if (!secTags.isEmpty()){
-                tags.add(new TaggedText(TagEnum.separator, secSeparator));
-                tags.addAll(secTags);
-            }
+        //ref.
+        List<TaggedText> secTags = getSecundumTags(taxonBase);
 
+        //sec.
+        if (!secTags.isEmpty()){
+            tags.add(new TaggedText(TagEnum.separator, secSeparator));
+            tags.addAll(secTags);
         }
+
         return tags;
     }