From: p.plitzner <p.plitzner@bgbm.org>
Date: Mon, 22 Feb 2016 17:16:46 +0000 (+0100)
Subject: Fix potential NPE #5511
X-Git-Tag: 4.0.0^2~131
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/30eec98647380b4f756df25697209a42088d5fff

Fix potential NPE #5511
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
index d40ecf09a..08efabd7e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
@@ -167,7 +167,9 @@ public class EditFromSelectionWizard extends Wizard implements
 	public boolean performFinish() {
 	    IService<CdmBase> service = CdmStore.getService(rootElement);
 	    service.merge(rootElement, true);
-	    previousCdmEntitySession.load(rootElement, true);
+	    if(previousCdmEntitySession!=null){
+	    	previousCdmEntitySession.load(rootElement, true);
+	    }
 		return true;
 	}