EDIT

package eu.etaxonomy.taxeditor.service;

import java.io.IOException;

import java.io.OutputStream;

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.service.UpdateResult;

import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;

@Component

public class CdmServiceRequestExecutor extends CdmAuthenticatedHttpInvokerRequestExecutor {

    @Autowired

    private ICdmEntitySessionManager cdmEntitySessionManager;

	private RemoteInvocation currentRemoteInvocation;

	@Override

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

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

			rir = super.doExecuteRequest(config, baos);

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

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

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

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

			      //FIXME:Remoting if the new handler / operation architecture works then this is not required

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

//			        if(result.isOk()){

//			            //FIXME:Remoting replace with call to CdmApplicationState if required

//			        }

			    } 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;

	}

}