ref #6118 catching exception during checkConnection

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / eu / etaxonomy / taxeditor / remoting / source / CdmRemoteSourceBase.java

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 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;
        }