remove findWithUpdate from CommonService

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java
index 3d1fedfdc477d449eddc84c0d07de3d660273dfe..32b6a19e50e2f3543e3e1e6fbb4e78e7484f4a88 100755 (executable)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java
@@ -28,8 +28,8 @@ public class ConversationalTransientEntityCacher extends CdmTransientEntityCache
     public ConversationalTransientEntityCacher(Object sessionOwner) {
         super(sessionOwner);
     }
-    private CdmBase load(CdmEntityIdentifier cei, boolean update) {
-        return CdmApplicationState.getCommonService().findWithUpdate(cei.getCdmClass(), cei.getId());
+    private CdmBase load(CdmEntityIdentifier cei) {
+        return CdmApplicationState.getCommonService().find(cei.getCdmClass(), cei.getId());
     }
 
     public UpdateResult load(UpdateResult result, boolean update) {
@@ -59,11 +59,11 @@ public class ConversationalTransientEntityCacher extends CdmTransientEntityCache
 
         // remote load cdm identifiers of objects which already exist
         // in the cache
-        for(CdmEntityIdentifier cei : updatedCdmIds) {
+        for(CdmEntityIdentifier id : updatedCdmIds) {
             @SuppressWarnings({ "rawtypes", "unchecked" })
-            CdmEntityCacheKey<?> cacheKey = new CdmEntityCacheKey(cei.getCdmClass(), cei.getId());
+            CdmEntityCacheKey<?> cacheKey = new CdmEntityCacheKey(id.getCdmClass(), id.getId());
             if(exists(cacheKey)) {
-                reloadedObjects.add(load(cei, update));
+                reloadedObjects.add(load(id));
             }
         }
         updatedObjects.clear();

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
index fdf7f1acc8d106867d76ddcdc5557233e3c0e6bb..2daea3c4052df72133e6d31a872c681b19bbfb2d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
@@ -52,7 +52,6 @@ public class CachingHttpInvokerProxyFactoryBean extends HttpInvokerProxyFactoryB
     static {
         persistingMethods.add("merge");
         persistingMethods.add("save");
-        persistingMethods.add("findWithUpdate");
         persistingMethods.add("loadWithUpdate");
         measureDuration = System.getProperty(PROP_KEY_MEASURE_DURATION) != null;
     }