BGBM BDI Projects
/
taxeditor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a3e69a3
)
ref #6118 catching exception during checkConnection
author
Andreas Kohlbecker
<a.kohlbecker@bgbm.org>
Tue, 11 Oct 2016 14:18:55 +0000
(16:18 +0200)
committer
Andreas Kohlbecker
<a.kohlbecker@bgbm.org>
Tue, 11 Oct 2016 14:19:13 +0000
(16:19 +0200)
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java
patch
|
blob
|
history
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
patch
|
blob
|
history
diff --git
a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java
b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java
index 59c24ea3b2f5497c692570e00582113aee6584b0..fc2b42c33d54f7610a6a7e7a7ce9c39ddf88e34c 100644
(file)
--- a/
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java
+++ b/
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java
@@
-10,6
+10,8
@@
package eu.etaxonomy.taxeditor.remoting.source;
import java.util.Map;
import java.util.Map;
+import org.springframework.remoting.RemoteAccessException;
+
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration;
import eu.etaxonomy.cdm.api.service.IMetadataService;
import eu.etaxonomy.cdm.config.CdmSource;
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteConfiguration;
import eu.etaxonomy.cdm.api.service.IMetadataService;
import eu.etaxonomy.cdm.config.CdmSource;
@@
-132,8
+134,11
@@
public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource {
// the connection is up
// if no exception is thrown then we assume that the
// connection is up
// the connection is up
// if no exception is thrown then we assume that the
// connection is up
- // FIXME:Remoting is this really correct?
- metadataService.getDbSchemaVersion();
+ try {
+ metadataService.getDbSchemaVersion();
+ } catch (RemoteAccessException e) {
+ throw new CdmSourceException("RemoteAccessException: " + e.getMessage());
+ }
return true;
}
return true;
}
diff --git
a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index 2ed42b85b4a8abb4419df3ffa335da12fc48b57c..8bc4ee63e95017f784f7a28452545e5ba5232a2a 100644
(file)
--- a/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@
-198,6
+198,7
@@
public class CdmStore {
final DbSchemaValidation dbSchemaValidation,
final Resource applicationContextBean,
RemotingLoginDialog remotingLoginDialog) {
final DbSchemaValidation dbSchemaValidation,
final Resource applicationContextBean,
RemotingLoginDialog remotingLoginDialog) {
+
RemotingLoginDialog loginDialog = remotingLoginDialog;
if(isActive()) {
// before we connect we clear the entity caches and the sessions
RemotingLoginDialog loginDialog = remotingLoginDialog;
if(isActive()) {
// before we connect we clear the entity caches and the sessions
@@
-266,7
+267,7
@@
public class CdmStore {
ICdmSource cdmSource) {
instance = new CdmStore(applicationController, cdmSource);
CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());
ICdmSource cdmSource) {
instance = new CdmStore(applicationController, cdmSource);
CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());
-
+
}
private CdmStore(ICdmApplicationConfiguration applicationController,
}
private CdmStore(ICdmApplicationConfiguration applicationController,