From ae2b6b1bbe07797bdefdf556499b6d470060117f Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 26 Oct 2015 18:25:30 +0100
Subject: [PATCH] Add check to make sure active session is not null

---
 .../taxeditor/session/DefaultNewEntityListener.java          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/DefaultNewEntityListener.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/DefaultNewEntityListener.java
index 7ce1808ac..dc519d8a0 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/DefaultNewEntityListener.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/DefaultNewEntityListener.java
@@ -32,7 +32,10 @@ public class DefaultNewEntityListener implements NewEntityListener {
     public void onCreate(CdmBase cdmBase) {
         logger.info("New Entity created : " + cdmBase);
         if(CdmApplicationState.getCurrentAppConfig() instanceof CdmApplicationRemoteController){
-            ((CdmApplicationRemoteController)CdmApplicationState.getCurrentAppConfig()).getCdmEntitySessionManager().getActiveSession().addNewCdmEntity(cdmBase);
+            ICdmEntitySession activeSession = ((CdmApplicationRemoteController)CdmApplicationState.getCurrentAppConfig()).getCdmEntitySessionManager().getActiveSession();
+            if(activeSession != null) {
+                activeSession.addNewCdmEntity(cdmBase);
+            }
         }
     }
 
-- 
2.34.1