ref #7095 Fix potential NPE

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/AggregationConfiguration.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/AggregationConfiguration.java
index db68d1b4638e28d089f48d528d11e8b2f5966b75..79a3cbf74481546f1c8548ad5fc4ce66d1d6437b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/AggregationConfiguration.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/workingSet/matrix/AggregationConfiguration.java
@@ -71,10 +71,10 @@ public class AggregationConfiguration extends DefaultSummaryRowConfiguration {
                     QuantitativeData quantitativeData = (QuantitativeData)dataValue;
                     Float min = quantitativeData.getMin();
                     Float max = quantitativeData.getMax();
-                    if(minTotal==null || min<minTotal){
+                    if(min!=null && (minTotal==null || min<minTotal)){
                         minTotal = min;
                     }
-                    if(maxTotal==null || max>maxTotal){
+                    if(max!=null && (maxTotal==null || max>maxTotal)){
                         maxTotal = max;
                     }
                 }