From: Katja Luther <k.luther@bgbm.org>
Date: Wed, 23 Nov 2016 13:54:51 +0000 (+0100)
Subject: fix #6215: check for datasource when opening preferencepage
X-Git-Tag: 4.4.0^2~18
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/84ab8cb061709145c824967aa8a3a10742e875ff

fix #6215: check for datasource when opening preferencepage
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
index 02ff53a0d..92a694130 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/CdmPreferencePage.java
@@ -46,8 +46,11 @@ public abstract class CdmPreferencePage extends PreferencePage implements ICdmEn
     }
 
     private void initSession() {
-        previousCdmEntitySession = CdmStore.getCurrentSessionManager().getActiveSession();
-        bindNullSession();
+        if (CdmStore.isActive()){
+            previousCdmEntitySession = CdmStore.getCurrentSessionManager().getActiveSession();
+            bindNullSession();
+        }
+
     }
 
     private void bindNullSession() {