From 84ab8cb061709145c824967aa8a3a10742e875ff Mon Sep 17 00:00:00 2001
From: Katja Luther <k.luther@bgbm.org>
Date: Wed, 23 Nov 2016 14:54:51 +0100
Subject: [PATCH] fix #6215: check for datasource when opening preferencepage

---
 .../taxeditor/preference/menu/CdmPreferencePage.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

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() {
-- 
2.34.1