Project

General

Profile

Revision 619ccb21

ID619ccb210a34f5d9f0a13b82953a92543562a29e
Parent 7118b734
Child 9657122e

Added by Andreas Müller about 1 year ago

ref #7745 fix failing pathFrom if subtree is null

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImpl.java
316 316
    }
317 317

  
318 318
    @Override
319
    public List<TaxonNode> loadTreeBranchToTaxon(Taxon taxon, Classification classification, TaxonNode subtree,
320
            Rank baseRank,
319
    public List<TaxonNode> loadTreeBranchToTaxon(Taxon taxon, Classification classification,
320
            TaxonNode subtree, Rank baseRank,
321 321
            boolean includeUnpublished, List<String> propertyPaths) throws UnpublishedException{
322 322

  
323 323
        UUID nodeUuid = getTaxonNodeUuidByTaxonUuid(classification.getUuid(), taxon.getUuid());
......
325 325
        if(node == null){
326 326
            logger.warn("The specified taxon is not found in the given tree.");
327 327
            return null;
328
        }else if (!node.isDescendant(subtree)){
328
        }else if (subtree != null && !node.isDescendant(subtree)){
329 329
            //TODO handle as exception? E.g. FilterException, AccessDeniedException?
330 330
            logger.warn("The specified taxon is not found for the given subtree.");
331 331
            return null;

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)