EDIT

package eu.etaxonomy.taxeditor.service;

import java.io.IOException;

import java.io.OutputStream;

import java.util.HashSet;

import java.util.Set;

import org.apache.http.NoHttpResponseException;

import org.apache.log4j.Logger;

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;

@Component

public class CdmServiceRequestExecutor extends CdmAuthenticatedHttpInvokerRequestExecutor {

    private static final Logger logger = Logger.getLogger(CdmServiceRequestExecutor.class);

    private ICdmEntitySessionManager cdmEntitySessionManager ;

	private RemoteInvocation currentRemoteInvocation;

	protected final static Set<String> cachableMethods = new HashSet<String>();

	public CdmServiceRequestExecutor() {

	    cachableMethods.add("merge");

	    cachableMethods.add("save");

	    cachableMethods.add("findWithUpdate");

	    cachableMethods.add("loadWithUpdate");

	}

	@Override

	protected void writeRemoteInvocation(RemoteInvocation invocation, OutputStream os) throws IOException {

	    if(cdmEntitySessionManager == null) {

	        cdmEntitySessionManager =

	                ((CdmApplicationRemoteController)CdmApplicationState.getCurrentAppConfig()).getCdmEntitySessionManager();

	    }

		currentRemoteInvocation = invocation;

		super.writeRemoteInvocation(invocation, os);

	}

	@Override

	protected RemoteInvocationResult doExecuteRequest(HttpInvokerClientConfiguration config,

			java.io.ByteArrayOutputStream baos)

					throws java.io.IOException,

					java.lang.ClassNotFoundException, NoHttpResponseException {

		RemoteInvocationResult rir = fromCache(currentRemoteInvocation);

		if(rir == null) {

		    if (!(currentRemoteInvocation.getMethodName() == null) && !(config.getServiceUrl() == null)){

		       // logger.info("Remote invoking : " + currentRemoteInvocation.getMethodName() + "@" + config.getServiceUrl());

		    }

		    try{

		        rir = super.doExecuteRequest(config, baos);

		    }catch(Exception e){

		        if (e instanceof NoHttpResponseException){

		           throw e;

		        }

		    }

			if(rir.getValue() != null && !rir.hasException()) {

			    if (currentRemoteInvocation == null){

			        logger.debug("return RemoteInvocationResult without caching" );

			        return rir;

			    }

                if(cachableMethods.contains(currentRemoteInvocation.getMethodName())) {

                    rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue(), true));

                } else if(rir.getValue() instanceof UpdateResult){

                    UpdateResult result = (UpdateResult)rir.getValue();

                    if(result.isOk()){

                        cdmEntitySessionManager.load(result, true);

                    }

                } else {

                    rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue(), false));

                }

			}

			cache(currentRemoteInvocation, rir);

		}

		currentRemoteInvocation = null;

		return rir;

	}

	public void cache(RemoteInvocation ri, RemoteInvocationResult rir) {

	}

	public RemoteInvocationResult fromCache(RemoteInvocation ri) {

	    return null;

	}

	 @Override

	    public void setReadTimeout(int timeout) {

	        logger.info("Read time our set to: " + timeout + " ms");

	        super.setReadTimeout(timeout);

	    }

}