Project

General

Profile

« Previous | Next » 

Revision c7641204

Added by Andreas Müller almost 3 years ago

fix #9636 fix NPE in DeterminationDetailElement

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java
19 19
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
20 20
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
21 21
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
22
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
22 23
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
23 24
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
24 25
import eu.etaxonomy.taxeditor.model.IElementHasDetails;
......
156 157
		    return true;
157 158
		}else if ((input instanceof DerivedUnitFacade)
158 159
                && (formSection instanceof DeterminationDetailSection)){
159
            ((DeterminationDetailSection)formSection).setEntity(((DerivedUnitFacade)input).innerDerivedUnit());
160
		    DerivedUnitFacade facade = ((DerivedUnitFacade)input);
161
		    SpecimenOrObservationBase<?> sob = facade.innerDerivedUnit() != null? facade.innerDerivedUnit(): facade.innerFieldUnit();
162
            ((DeterminationDetailSection)formSection).setEntity(sob);
160 163
            return true;
161 164
		}else if ((input instanceof DerivedUnitFacade)
162 165
                && (formSection instanceof SampleDesignationDetailSection)){

Also available in: Unified diff