BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3ce4a30)
Fix potential NPE #5511
authorp.plitzner <p.plitzner@bgbm.org>
Mon, 22 Feb 2016 17:16:46 +0000 (18:16 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 23 Feb 2016 14:50:15 +0000 (15:50 +0100)
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java patch | blob | history

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 d40ecf09a122b81fe574ce74b5b7e64be9e4ee7f..08efabd7e04984d573c125d7fd6a3c27dbe96c55 100644 (file)
--- 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);
        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;
        }
 
                return true;
        }