From 4fbac559e3e4441822a30b0ae03377f843b49501 Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 5 Oct 2015 15:05:23 +0200
Subject: [PATCH] Add check for remoting before setting new entity listener

---
 .../etaxonomy/cdm/api/application/CdmApplicationState.java  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
index 1251d3325..bcd6dff64 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
@@ -45,7 +45,6 @@ public class CdmApplicationState {
     public static CdmApplicationState getInstance() {
         if(cdmApplicationState == null) {
             cdmApplicationState = new CdmApplicationState();
-            CdmBase.setNewEntityListener(new DefaultNewEntityListener());
         }
 
         return cdmApplicationState;
@@ -53,6 +52,11 @@ public class CdmApplicationState {
 
     public void setAppConfig(ICdmApplicationConfiguration appConfig) {
         this.appConfig = appConfig;
+        if(appConfig instanceof CdmApplicationRemoteController) {
+            CdmBase.setNewEntityListener(new DefaultNewEntityListener());
+        } else {
+            CdmBase.setNewEntityListener(null);
+        }
     }
 
     public ICdmApplicationConfiguration getAppConfig() {
-- 
2.34.1