#4932 Remove autowired members, Use serliaised cdm model map

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / eu / etaxonomy / taxeditor / service / CdmServiceRequestExecutor.java

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
index 0b7ca355d920d5e66afbbb4e57caba5715c974d4..8084eac89bf742d6cdc4cb1b2508780e8c948f9d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
@@ -4,12 +4,13 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.remoting.httpinvoker.HttpInvokerClientConfiguration;
 import org.springframework.remoting.support.RemoteInvocation;
 import org.springframework.remoting.support.RemoteInvocationResult;
 import org.springframework.stereotype.Component;
 
+import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController;
+import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
 
@@ -18,13 +19,18 @@ public class CdmServiceRequestExecutor extends CdmAuthenticatedHttpInvokerReques
 
     private static final Logger logger = Logger.getLogger(CdmServiceRequestExecutor.class);
 
-    @Autowired
-    private ICdmEntitySessionManager cdmEntitySessionManager;
+    private ICdmEntitySessionManager cdmEntitySessionManager ;
 
        private RemoteInvocation currentRemoteInvocation;
 
+
+
        @Override
        protected void writeRemoteInvocation(RemoteInvocation invocation, OutputStream os) throws IOException {
+           if(cdmEntitySessionManager == null) {
+               cdmEntitySessionManager =
+                       ((CdmApplicationRemoteController)CdmApplicationState.getCurrentAppConfig()).getCdmEntitySessionManager();
+           }
                currentRemoteInvocation = invocation;
                super.writeRemoteInvocation(invocation, os);
        }