From d02ff6c0392861a081f2b4d6b6217178efb08b03 Mon Sep 17 00:00:00 2001
From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 23 Nov 2015 10:39:22 +0100
Subject: [PATCH] Revert cached services map to be local to configuration class

---
 .../CdmApplicationRemoteConfiguration.java    | 22 +++++++++++--------
 .../httpinvoker/CdmRemoteSourceTest.java      |  7 +-----
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
index a1ce7e404..26f688925 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java
@@ -106,7 +106,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
 
     private ICdmRemoteSource remoteSource;
 
-    private static Map serviceMap = new HashMap<Class<IService>, IService>();
+    private Map serviceMap = new HashMap<Class<IService>, IService>();
 
     private ICdmEntitySessionManager cdmEntitySessionManager;
 
@@ -120,7 +120,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
 
     public CdmApplicationRemoteConfiguration(ICdmRemoteSource remoteSource) {
         this.remoteSource = remoteSource;
-        serviceMap.clear();
+
     }
 
     public void setRemoteSource(ICdmRemoteSource remoteSource) {
@@ -128,13 +128,19 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
     }
 
     private Object getService(Class<?> clazz, String serviceSuffix, CdmAuthenticatedHttpInvokerRequestExecutor executor) {
-        return getService(clazz, serviceSuffix, remoteSource, executor);
-    }
-
-    public static Object getService(Class<?> clazz, String serviceSuffix, ICdmRemoteSource remoteSource, CdmAuthenticatedHttpInvokerRequestExecutor executor) {
         if(serviceMap.containsKey(clazz)) {
             return serviceMap.get(clazz);
         }
+        Object service = getService(clazz, serviceSuffix, remoteSource, executor);
+        serviceMap.put(clazz,  service);
+        return service;
+    }
+
+    public static Object getService(Class<?> clazz,
+            String serviceSuffix,
+            ICdmRemoteSource remoteSource,
+            CdmAuthenticatedHttpInvokerRequestExecutor executor) {
+
         String baseUrl;
         if(remoteSource.getContextPath() == null || remoteSource.getContextPath().equals("")) {
             baseUrl = "http://" + remoteSource.getServer() + ":" + String.valueOf(remoteSource.getPort());
@@ -149,9 +155,7 @@ public class CdmApplicationRemoteConfiguration implements ICdmApplicationConfigu
             proxy.setHttpInvokerRequestExecutor(executor);
         }
         proxy.afterPropertiesSet();
-        Object service = proxy.getObject();
-        serviceMap.put(clazz,  service);
-        return service;
+        return proxy.getObject();
     }
 
     // ****************************** APPLICATION CONTEXT *************************************************/
diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmRemoteSourceTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmRemoteSourceTest.java
index b3225b97f..945d5c648 100644
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmRemoteSourceTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmRemoteSourceTest.java
@@ -32,7 +32,7 @@ public class CdmRemoteSourceTest extends BaseRemotingTest {
 		        contextPath,
 		        NomenclaturalCode.ICNAFP);
 		try {
-			inactiveCrs.getDbSchemaVersion();
+			String dbSchemaVersion = inactiveCrs.getDbSchemaVersion();
 			Assert.fail("getDbSchemaVersion() on inactive cdm server should have thrown RemoteAccessException");
 		} catch(CdmSourceException cse) {
 			Assert.fail("getDbSchemaVersion() on inactive cdm server should have thrown RemoteAccessException and not CdmSourceException");
@@ -60,11 +60,6 @@ public class CdmRemoteSourceTest extends BaseRemotingTest {
 
 	}
 
-	@Test
-	public void whenConnectingToAnActiveServerWithServicesBlockedThenFailToAccessServices() {
-
-	}
-
 	@Test
 	public void whenConnectingToAnActiveServerThenConnectSuccessfully() {
 		// check if active server throws the right exception
-- 
2.34.1