Project

General

Profile

« Previous | Next » 

Revision 2c37ed60

Added by Katja Luther over 2 years ago

ref #9772: avoid NPE in aggregation handler

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java
73 73 
                nodeDtos.add((TaxonNodeDto)o);
74 74 
            }
75 75 
        }
76 
        TaxonNodeFilter filter = TaxonNodeFilter.NewRankInstance(matrix.getDescriptiveDataSet().getMinRank().getUuid(),
77 
                matrix.getDescriptiveDataSet().getMaxRank().getUuid());
78 
        for (TermDto namedArea : matrix.getDescriptiveDataSet().getGeoFilter()) {
79 
            filter = filter.orArea(namedArea.getUuid());
76 
        UUID minRankUuid = matrix.getDescriptiveDataSet().getMinRank() != null? matrix.getDescriptiveDataSet().getMinRank().getUuid(): null;
77 
        UUID maxRankUuid = matrix.getDescriptiveDataSet().getMaxRank() != null? matrix.getDescriptiveDataSet().getMaxRank().getUuid(): null;
78 
        TaxonNodeFilter filter = TaxonNodeFilter.NewRankInstance(minRankUuid, maxRankUuid);
79 
        if (matrix.getDescriptiveDataSet().getGeoFilter() != null){
80 
            for (TermDto namedArea : matrix.getDescriptiveDataSet().getGeoFilter()) {
81 
                filter = filter.orArea(namedArea.getUuid());
82 
            }
80 83 
        }
81 84 

  		




  82
  85
  
    

  		












Also available in:  Unified diff