Project

General

Profile

Revision 1d54cd17

ID1d54cd17de6f310b117e09da584341e8afe31399
Parent ae7b9470
Child 7dde0731

Added by Andreas Müller almost 3 years ago

ref #6065 fix NPEs in classification service

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
720 720
            NodeSortMode sortMode) {
721 721
        TaxonInContextDTO result = new TaxonInContextDTO();
722 722
        TaxonBase<?> taxonBase = taxonDao.load(taxonUuid);
723
        if (taxonBase == null){
724
            return result;  //TODO
725
        }
723 726

  
724 727
        TaxonNameBase<?,?> name = taxonBase.getName();
725 728
        result.setNameUuid(name.getUuid());
......
762 765
        }
763 766

  
764 767
        //marked ancestors
765
        if (!ancestorMarkers.isEmpty()){
768
        if (ancestorMarkers != null && !ancestorMarkers.isEmpty()){
766 769
            List<DefinedTermBase> markerTypesTerms = termDao.list(ancestorMarkers, pageSize, null, null, null);
767 770
            List<MarkerType> markerTypes = new ArrayList<>();
768 771
            for (DefinedTermBase<?> term : markerTypesTerms){

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)