Revision ecac085c
Added by Andreas Kohlbecker over 7 years ago
| eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java | ||
|---|---|---|
| 10 | 10 |
|
| 11 | 11 |
import java.util.Map; |
| 12 | 12 |
|
| 13 |
import org.springframework.remoting.RemoteAccessException; |
|
| 14 |
|
|
| 15 | 13 |
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration; |
| 16 | 14 |
import eu.etaxonomy.cdm.api.service.IMetadataService; |
| 17 | 15 |
import eu.etaxonomy.cdm.config.CdmSource; |
| ... | ... | |
| 134 | 132 |
// the connection is up |
| 135 | 133 |
// if no exception is thrown then we assume that the |
| 136 | 134 |
// connection is up |
| 137 |
try {
|
|
| 138 |
metadataService.getDbSchemaVersion(); |
|
| 139 |
} catch (RemoteAccessException e) {
|
|
| 140 |
throw new CdmSourceException("RemoteAccessException: " + e.getMessage());
|
|
| 141 |
} |
|
| 135 |
// FIXME:Remoting is this really correct? |
|
| 136 |
metadataService.getDbSchemaVersion(); |
|
| 142 | 137 |
|
| 143 | 138 |
return true; |
| 144 | 139 |
} |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java | ||
|---|---|---|
| 198 | 198 |
final DbSchemaValidation dbSchemaValidation, |
| 199 | 199 |
final Resource applicationContextBean, |
| 200 | 200 |
RemotingLoginDialog remotingLoginDialog) {
|
| 201 |
|
|
| 202 | 201 |
RemotingLoginDialog loginDialog = remotingLoginDialog; |
| 203 | 202 |
if(isActive()) {
|
| 204 | 203 |
// before we connect we clear the entity caches and the sessions |
| ... | ... | |
| 267 | 266 |
ICdmSource cdmSource) {
|
| 268 | 267 |
instance = new CdmStore(applicationController, cdmSource); |
| 269 | 268 |
CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher()); |
| 270 |
|
|
| 269 |
|
|
| 271 | 270 |
} |
| 272 | 271 |
|
| 273 | 272 |
private CdmStore(ICdmApplicationConfiguration applicationController, |
Also available in: Unified diff
Revert "ref #6118 catching exception during checkConnection"
This reverts commit bb7b4f601b49f1ba29f149405246f120b4c46a9a.