From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Tue, 11 Oct 2016 14:18:55 +0000 (+0200)
Subject: ref #6118 catching exception during checkConnection
X-Git-Tag: 4.4.0^2~113
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/bb7b4f601b49f1ba29f149405246f120b4c46a9a?hp=a3e69a37383c07c575a7592c1093f68dcc6e830a

ref #6118 catching exception during checkConnection
---

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 59c24ea3b..fc2b42c33 100644
--- 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 org.springframework.remoting.RemoteAccessException;
+
 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
-		// FIXME:Remoting is this really correct?
-		metadataService.getDbSchemaVersion();
+	    try {
+	        metadataService.getDbSchemaVersion();
+	    } catch (RemoteAccessException e) {
+	        throw new CdmSourceException("RemoteAccessException: " + e.getMessage());
+	    }
 
 		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 2ed42b85b..8bc4ee63e 100644
--- 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) {
+
         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());
-        
+
     }
 
     private CdmStore(ICdmApplicationConfiguration applicationController,