Revision 6034c463
Added by Katja Luther about 6 years ago
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java | ||
---|---|---|
46 | 46 |
|
47 | 47 |
private final ICdmEntitySessionEnabled sessionOwner; |
48 | 48 |
|
49 |
private CdmTransientEntityCacher cdmTransientEntityCacher;
|
|
49 |
private ConversationalTransientEntityCacher cdmTransientEntityCacher;
|
|
50 | 50 |
|
51 | 51 |
private List<ICdmEntitySessionEnabled> changeObservers; |
52 | 52 |
|
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/CdmEntitySessionInput.java | ||
---|---|---|
43 | 43 |
if(cdmEntitySession!=null){ |
44 | 44 |
cdmEntitySession.bind(); |
45 | 45 |
} |
46 |
else { |
|
47 |
initSession(); |
|
48 |
} |
|
46 | 49 |
} |
47 | 50 |
|
48 | 51 |
public void dispose() { |
... | ... | |
50 | 53 |
cdmEntitySession.dispose(); |
51 | 54 |
} |
52 | 55 |
cdmEntitySession = null; |
56 |
|
|
53 | 57 |
} |
54 | 58 |
|
55 | 59 |
public abstract void merge(); |
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java | ||
---|---|---|
27 | 27 |
import eu.etaxonomy.cdm.api.application.CdmDataChangeService; |
28 | 28 |
import eu.etaxonomy.cdm.api.cache.CdmServiceCacher; |
29 | 29 |
import eu.etaxonomy.cdm.cache.CdmRemoteCacheManager; |
30 |
import eu.etaxonomy.cdm.cache.CdmTransientEntityCacher;
|
|
30 |
import eu.etaxonomy.taxeditor.remoting.cache.ConversationalTransientEntityCacher;
|
|
31 | 31 |
import eu.etaxonomy.taxeditor.remoting.source.CdmPersistentRemoteSource; |
32 | 32 |
import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource; |
33 | 33 |
import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource; |
... | ... | |
150 | 150 |
return ((InheritableThreadLocal<CdmEntitySession>) getFieldValueViaReflection(cdmEntitySessionManager, "tlActiveSession")).get(); |
151 | 151 |
} |
152 | 152 |
|
153 |
protected static eu.etaxonomy.cdm.cache.CdmTransientEntityCacher getCacher(ICdmEntitySessionEnabled sessionOwner) {
|
|
154 |
return (CdmTransientEntityCacher) getFieldValueViaReflection(getSession(sessionOwner), "cdmTransientEntityCacher");
|
|
153 |
protected static ConversationalTransientEntityCacher getCacher(ICdmEntitySessionEnabled sessionOwner) {
|
|
154 |
return (ConversationalTransientEntityCacher) getFieldValueViaReflection(getSession(sessionOwner), "cdmTransientEntityCacher");
|
|
155 | 155 |
} |
156 | 156 |
|
157 | 157 |
|
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/RemotingSessionAwareTest.java | ||
---|---|---|
17 | 17 |
import eu.etaxonomy.cdm.api.application.CdmApplicationState; |
18 | 18 |
import eu.etaxonomy.cdm.api.service.IUserService; |
19 | 19 |
import eu.etaxonomy.cdm.model.common.User; |
20 |
import eu.etaxonomy.taxeditor.remoting.cache.ConversationalTransientEntityCacher; |
|
20 | 21 |
import eu.etaxonomy.taxeditor.session.ICdmEntitySession; |
21 | 22 |
import eu.etaxonomy.taxeditor.session.MockSessionOwner; |
22 | 23 |
|
... | ... | |
29 | 30 |
|
30 | 31 |
private static final Logger logger = Logger.getLogger(RemotingSessionAwareTest.class); |
31 | 32 |
|
32 |
protected eu.etaxonomy.cdm.cache.CdmTransientEntityCacher cacher;
|
|
33 |
protected ConversationalTransientEntityCacher cacher;
|
|
33 | 34 |
protected MockSessionOwner sessionOwner; |
34 | 35 |
|
35 | 36 |
private static String extraUsername = "Someone"; |
Also available in: Unified diff
fix using correct cache