From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Tue, 11 Oct 2016 16:29:48 +0000 (+0200)
Subject: Revert "ref #6118 catching exception during checkConnection"
X-Git-Tag: 4.4.0^2~109
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/ecac085c8b119a7864ba899071e9f115e771a255?hp=2cb5f12088cdb24505fa6e5fdf4540f0b34d393c

Revert "ref #6118 catching exception during checkConnection"

This reverts commit bb7b4f601b49f1ba29f149405246f120b4c46a9a.
---

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 fc2b42c33..59c24ea3b 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,8 +10,6 @@ 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;
@@ -134,11 +132,8 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource {
 		// the connection is up
 		// if no exception is thrown then we assume that the
 		// connection is up
-	    try {
-	        metadataService.getDbSchemaVersion();
-	    } catch (RemoteAccessException e) {
-	        throw new CdmSourceException("RemoteAccessException: " + e.getMessage());
-	    }
+		// FIXME:Remoting is this really correct?
+		metadataService.getDbSchemaVersion();
 
 		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 8bc4ee63e..2ed42b85b 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,7 +198,6 @@ 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
@@ -267,7 +266,7 @@ public class CdmStore {
             ICdmSource cdmSource) {
         instance = new CdmStore(applicationController, cdmSource);
         CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());
-
+        
     }
 
     private CdmStore(ICdmApplicationConfiguration applicationController,