ref #9772: avoid NPE in aggregation handler - continue

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java
index 8d1399fbccb93dfd7a12d189fa010193f1dc9849..25a3f8fd870e48bfc6db8a6edd1402096d4affba 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredAggregationConfigurationWizard.java
@@ -9,6 +9,7 @@
 package eu.etaxonomy.taxeditor.ui.dialog.configurator;
 
 import java.util.List;
+import java.util.UUID;
 
 import org.eclipse.jface.wizard.Wizard;
 
@@ -68,11 +69,15 @@ public class StructuredAggregationConfigurationWizard extends Wizard implements
 //        }
         TaxonNodeFilter filter = configurator.getTaxonNodeFilter();
         if (!page.useHigherLevel()) {
-            filter.setRankMax(dataSet.getMaxRank().getUuid());
-            filter.setRankMin(dataSet.getMinRank().getUuid());
-
-            for (TermDto namedArea : dataSet.getGeoFilter()) {
-                filter = filter.orArea(namedArea.getUuid());
+            UUID minRankUuid = dataSet.getMinRank() != null? dataSet.getMinRank().getUuid(): null;
+            UUID maxRankUuid = dataSet.getMinRank() != null? dataSet.getMaxRank().getUuid(): null;
+            filter.setRankMax(maxRankUuid);
+            filter.setRankMin(minRankUuid);
+
+            if (dataSet.getGeoFilter() != null){
+                for (TermDto namedArea : dataSet.getGeoFilter()) {
+                    filter = filter.orArea(namedArea.getUuid());
+                }
             }
             //TODO: check whether this is correct!!!!
             for (TaxonNode node: page.getSelectedTaxonNodes()) {