ref #9405 , ref #4944 fix NPE in CacheRelevanceHelper

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CacheRelevanceHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CacheRelevanceHelper.java
index 1e22f726805896fa32fe4a4c635b3837cdeca4f3..a1cacf30153c432ca50357cbad0ffb55e59fa317 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CacheRelevanceHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CacheRelevanceHelper.java
@@ -22,17 +22,21 @@ public class CacheRelevanceHelper {
     public CacheRelevance cacheRelevance() {
         CacheRelevance result = CacheRelevance.NONE;
         for (ToggleableTextElement cache : this.cacheDependencies){
-            if (cache.getState()){
-                result = result.addCacheRelevance(cache.getRelevance());
+            if (cache != null){  //null should not happen anymore but just in case
+                if (cache.getState()){
+                    result = result.addCacheRelevance(cache.getRelevance());
+                }
+                //add recursion for light dependencies
+                result = result.addCacheRelevance(cache.cacheRelevance().getLight());
             }
-            //add recursion for light dependencies
-            result = result.addCacheRelevance(cache.cacheRelevance().getLight());
         }
         return result;
     }
 
     public void addDependsOnCache(ToggleableTextElement toggleElement) {
-        cacheDependencies.add(toggleElement);
+        if (toggleElement != null){
+            cacheDependencies.add(toggleElement);
+        }
     }
 
     /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
index 1acab239b092dd2f34c9de411a3b2983f68ad9fd..ca12af7193df99d24c321706d1f7ab5598b8ff54 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
@@ -156,7 +156,9 @@ public abstract class AbstractCdmDetailElement<T>
     protected void registerCacheRelevance(ICacheRelevantFormElement element, ToggleableTextElement... toggleableCaches) {
         if (element != null && toggleableCaches != null) {
              for (ToggleableTextElement toggleableCache : toggleableCaches){
-                 element.addDependsOnCache(toggleableCache);
+                 if (toggleableCache != null){
+                     element.addDependsOnCache(toggleableCache);
+                 }
              }
         }
 //        updateCacheRelevance();