Project

General

Profile

« Previous | Next » 

Revision 348d552a

Added by Cherian Mathew about 9 years ago

AbstractPersistentCollection : fixed loading of collection
MockCdmEntitySessionManager, MockCdmEntitySession, ICdmEntitySessionManager, ICdmEntitySession, CdmEntitySessionManager,
CdmEntitySession : added new load method with choice to update client object graph
TermServiceRequestExecutor : using cacher instead of cache
ICachedCommonService, CachedCommonServiceImpl, ProxyUtils : moved utility methods to utility class
CdmServiceRequestExecutor : updating client object graph when calling merge
EntityCacherDebugResult : corrections for output string
CdmTransientEntityCacher : corrected cache configuration, added load methods with update choice, added service cacher check before put
CacheLoader : checking in recursive call if collection and maps are already visited
CdmRemotingException : added constructor with exception as argument
CdmServiceCacher : corrected cache configuration and loading of entities from default cache

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/service/CdmServiceRequestExecutor.java
39 39
		if(rir == null) {
40 40
			rir = super.doExecuteRequest(config, baos);
41 41
			if(rir.getValue() != null && !rir.hasException()) {
42
			    rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue()));
42
			    if(currentRemoteInvocation.getMethodName().equals("merge")) {
43
			        rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue(), true));
44
			    } else {
45
			        rir = new RemoteInvocationResult(cdmEntitySessionManager.load(rir.getValue(), false));
46
			    }
43 47
			}
44 48
			cache(currentRemoteInvocation, rir);
45 49
		}

Also available in: Unified diff