Project

General

Profile

« Previous | Next » 

Revision c7322065

Added by Patrick Plitzner over 9 years ago

-fixed possible NPE (fixes #4532)

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java
654 654
				// Set<DerivationEvent> derivationEvents =
655 655
				// original.getDerivationEvents();
656 656
				// for (DerivationEvent originalDerivation : derivationEvents){
657
				Set<FieldUnit> fieldUnits = getFieldUnitOriginals(
658
						originalDerivation, recursionAvoidSet);
659
				result.addAll(fieldUnits);
657
				if(originalDerivation!=null){
658
				    Set<FieldUnit> fieldUnits = getFieldUnitOriginals(
659
				            originalDerivation, recursionAvoidSet);
660
				    result.addAll(fieldUnits);
661
				}
660 662
				// }
661 663
			} else {
662 664
				throw new DerivedUnitFacadeNotSupportedException(

Also available in: Unified diff