Project

General

Profile

« Previous | Next » 

Revision dfcde26e

Added by Andreas Müller over 9 years ago

Handle null object in StoreUtil.getCdmEntity

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
55 55
	 */
56 56
	public static CdmBase getCdmEntity(Object object){
57 57
        // TODO temporary solution for ticket #4091????
58
        if(object instanceof DerivedUnitFacade){
58
        if (object == null){
59
        	return null;   //not sure if an object should ever be null at this point, but this needs to be handled in calling methods
60
        }else if(object instanceof DerivedUnitFacade){
59 61
            return ((DerivedUnitFacade)object).baseUnit();
60 62
        }
61 63
        else if(object instanceof FeatureNodeContainer){

Also available in: Unified diff