Add null check for session

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
index 6eb54ff1ce7d588055501526c0fb94951b86b5f6..8a14a5a73030305a3b687c1dfed1dc7feb7ccab6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
@@ -96,7 +96,7 @@ public class DerivateSearchView extends ViewPart implements IContextListener, IC
     }
 
     private void initSession() {
-        if(CdmStore.isActive() && cdmEntitySession == null) {
+        if(CdmStore.isActive()) {
             cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true);
         }
     }
@@ -126,7 +126,9 @@ public class DerivateSearchView extends ViewPart implements IContextListener, IC
             conversationHolder.close();
         }
 
-        cdmEntitySession.dispose();
+        if(cdmEntitySession != null) {
+            cdmEntitySession.dispose();
+        }
         super.dispose();
     }