From bdb766b84136df45b14bf5cdce104f2ff85a83dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Wed, 20 Jun 2012 10:02:04 +0000 Subject: [PATCH] possible NPE fix --- .../java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java index 7e0c39fd9..65403941d 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java @@ -23,6 +23,7 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.api.service.IClassificationService; import eu.etaxonomy.cdm.api.service.ITaxonNodeService; import eu.etaxonomy.cdm.api.service.ITaxonService; +import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.ITreeNode; import eu.etaxonomy.cdm.model.taxon.Synonym; @@ -108,8 +109,8 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).find(taxonBaseUuid); - if(taxonBase instanceof Taxon){ - Taxon taxon = (Taxon) taxonBase; + if(taxonBase.isInstanceOf(Taxon.class)){ + Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class); if (taxon.isMisapplication()){ // TODO get accepted taxon -- 2.34.1