fix using correct cache

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
index cb3effd764187784a1e6350bd500fb6e058104e6..01ed0d44f0d7767f0cae0074a32ad1c67030c70e 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
@@ -46,7 +46,7 @@ public class CdmEntitySession implements ICdmEntitySession  {
 
     private final ICdmEntitySessionEnabled sessionOwner;
 
-    private CdmTransientEntityCacher cdmTransientEntityCacher;
+    private ConversationalTransientEntityCacher cdmTransientEntityCacher;
 
     private List<ICdmEntitySessionEnabled> changeObservers;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/CdmEntitySessionInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/CdmEntitySessionInput.java
index dbc78e8400d48f3584a010e4ad7abe0af9604018..aec18138929dd4c4376bed2c2972c4cf7b6dbb6e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/CdmEntitySessionInput.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/CdmEntitySessionInput.java
@@ -43,6 +43,9 @@ public abstract class CdmEntitySessionInput implements ICdmEntitySessionEnabled
         if(cdmEntitySession!=null){
             cdmEntitySession.bind();
         }
+        else {
+            initSession();
+        }
     }
 
     public void dispose() {
@@ -50,6 +53,7 @@ public abstract class CdmEntitySessionInput implements ICdmEntitySessionEnabled
             cdmEntitySession.dispose();
         }
         cdmEntitySession = null;
+
     }
 
     public abstract void merge();

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
index 5605bf9797d4f8c54e0b2df67bc30214c34d0a10..b7599c5ed2bae219fcba57bc234da24460ea3dfe 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.application.CdmDataChangeService;
 import eu.etaxonomy.cdm.api.cache.CdmServiceCacher;
 import eu.etaxonomy.cdm.cache.CdmRemoteCacheManager;
-import eu.etaxonomy.cdm.cache.CdmTransientEntityCacher;
+import eu.etaxonomy.taxeditor.remoting.cache.ConversationalTransientEntityCacher;
 import eu.etaxonomy.taxeditor.remoting.source.CdmPersistentRemoteSource;
 import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;
 import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
@@ -150,8 +150,8 @@ public abstract class BaseRemotingTest extends ThreadedTest {
         return ((InheritableThreadLocal<CdmEntitySession>) getFieldValueViaReflection(cdmEntitySessionManager, "tlActiveSession")).get();
     }
 
-    protected static eu.etaxonomy.cdm.cache.CdmTransientEntityCacher getCacher(ICdmEntitySessionEnabled sessionOwner) {
-        return (CdmTransientEntityCacher) getFieldValueViaReflection(getSession(sessionOwner), "cdmTransientEntityCacher");
+    protected static ConversationalTransientEntityCacher getCacher(ICdmEntitySessionEnabled sessionOwner) {
+        return (ConversationalTransientEntityCacher) getFieldValueViaReflection(getSession(sessionOwner), "cdmTransientEntityCacher");
     }
 
 

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
index 48b24f983403b08299655bc2b3d90753f2a6c13d..66a095068a5ae16234dcc437c64af54b6f1e5ed8 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java
@@ -17,6 +17,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.service.IUserService;
 import eu.etaxonomy.cdm.model.common.User;
+import eu.etaxonomy.taxeditor.remoting.cache.ConversationalTransientEntityCacher;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.session.MockSessionOwner;
 
@@ -29,7 +30,7 @@ public abstract class RemotingSessionAwareTest extends BaseRemotingTest {
 
     private static final Logger logger = Logger.getLogger(RemotingSessionAwareTest.class);
 
-    protected eu.etaxonomy.cdm.cache.CdmTransientEntityCacher cacher;
+    protected ConversationalTransientEntityCacher cacher;
     protected MockSessionOwner sessionOwner;
 
     private static String extraUsername = "Someone";