EDIT

package eu.etaxonomy.taxeditor.service;

import java.io.IOException;

import java.io.OutputStream;

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;

	@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 {

		RemoteInvocationResult rir = fromCache(currentRemoteInvocation);

		// if rir is not null at this point we assume that the

		// the object has already been loaded in the cache and

		// does not need to be reloaded

		if(rir == null) {

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

			rir = super.doExecuteRequest(config, baos);

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

                if("merge".equals(currentRemoteInvocation.getMethodName()) ||

                        "save".equals(currentRemoteInvocation.getMethodName()) ||

                        "findWithUpdate".equals(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;

	}

}