Revision f4f5cd63
Added by Cherian Mathew over 8 years ago
| eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java | ||
|---|---|---|
| 43 | 43 |
public static CdmApplicationState getInstance() {
|
| 44 | 44 |
if(cdmApplicationState == null) {
|
| 45 | 45 |
cdmApplicationState = new CdmApplicationState(); |
| 46 |
cdmServiceCacher = new CdmServiceCacher(); |
|
| 47 | 46 |
} |
| 48 | 47 |
|
| 49 | 48 |
return cdmApplicationState; |
| ... | ... | |
| 201 | 200 |
return cdmServiceCacher; |
| 202 | 201 |
} |
| 203 | 202 |
|
| 203 |
public static void setCdmServiceCacher(CdmServiceCacher cacher) {
|
|
| 204 |
cdmServiceCacher = cacher; |
|
| 205 |
} |
|
| 206 |
|
|
| 204 | 207 |
|
| 205 | 208 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java | ||
|---|---|---|
| 26 | 26 |
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController; |
| 27 | 27 |
import eu.etaxonomy.cdm.api.application.CdmApplicationState; |
| 28 | 28 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; |
| 29 |
import eu.etaxonomy.cdm.api.cache.CdmServiceCacher; |
|
| 29 | 30 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 30 | 31 |
import eu.etaxonomy.cdm.api.service.ICommonService; |
| 31 | 32 |
import eu.etaxonomy.cdm.api.service.IService; |
| ... | ... | |
| 241 | 242 |
static void setInstance(ICdmApplicationConfiguration applicationController, |
| 242 | 243 |
ICdmSource cdmSource) {
|
| 243 | 244 |
instance = new CdmStore(applicationController, cdmSource); |
| 245 |
if(getCurrentSessionManager().isRemoting()) {
|
|
| 246 |
CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher()); |
|
| 247 |
} |
|
| 244 | 248 |
} |
| 245 | 249 |
|
| 246 | 250 |
private CdmStore(ICdmApplicationConfiguration applicationController, |
| eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java | ||
|---|---|---|
| 39 | 39 |
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController; |
| 40 | 40 |
import eu.etaxonomy.cdm.api.application.CdmApplicationState; |
| 41 | 41 |
import eu.etaxonomy.cdm.api.application.CdmDataChangeService; |
| 42 |
import eu.etaxonomy.cdm.api.cache.CdmServiceCacher; |
|
| 42 | 43 |
import eu.etaxonomy.cdm.model.name.NomenclaturalCode; |
| 43 | 44 |
import eu.etaxonomy.taxeditor.remoting.cache.CdmRemoteCacheManager; |
| 44 | 45 |
import eu.etaxonomy.taxeditor.remoting.cache.CdmTransientEntityCacher; |
| ... | ... | |
| 161 | 162 |
null, |
| 162 | 163 |
null); |
| 163 | 164 |
CdmApplicationState.setCurrentAppConfig(remoteApplicationController); |
| 165 |
CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher()); |
|
| 164 | 166 |
try {
|
| 165 | 167 |
remotePersistentSource = CdmPersistentRemoteSource.NewInstance(sourceName); |
| 166 | 168 |
} catch (CdmRemoteSourceException e) {
|
Also available in: Unified diff
#5181 Fix incorrect load of CdmServiceCacher when connecting via Datasource view