Merge pull request #86 from Rdornier/cache-facility

Fix bug when connecting to multiple servers

Author: jburel

src/main/java/omero/gateway/Gateway.java

@@ -187,6 +187,8 @@ public class Gateway implements AutoCloseable {
     /** Flag to indicate that executor threads should be shutdown on disconnect */
     private boolean executorShutdownOnDisconnect = false;
 
+    private String serverHost;
+
     /**
      * Creates a new Gateway instance
      * @param log A {@link Logger}
@@ -408,6 +410,20 @@ public String getServerVersion() throws DSOutOfServiceException {
         return serverVersion;
     }
 
+    /**
+     * Get the hostname of the server the Gateway is connected to
+     *
+     * @return See above
+     * @throws DSOutOfServiceException
+     *             If the connection is broken, or not logged in
+     */
+    public String getServerHost() throws DSOutOfServiceException{
+        if (serverHost == null) {
+            throw new DSOutOfServiceException("Not logged in.");
+        }
+        return serverHost;
+    }
+
     /**
      * Get a {@link Facility} to perform further operations with the server
      * 
@@ -1221,6 +1237,7 @@ private ExperimenterData login(SessionWrapper session, LoginCredentials cred)
             }
             // Connector now controls the secureClient for closing.
             String host = session.client.getProperty("omero.host");
+            this.serverHost = host;
             cred.getServer().setHostname(host);
             String port = session.client.getProperty("omero.port");
             cred.getServer().setPort(Integer.parseInt(port));

src/main/java/omero/gateway/facility/Facility.java

@@ -115,8 +115,14 @@ public static <T extends Facility> T getFacility(final Class<T> type,
                         + type.getSimpleName(), e);
             }
         }
-        
-        return (T) cache.get(type.getSimpleName(), new Callable<Facility>() {
+        String serverHost;
+        try{
+            serverHost = gateway.getServerHost();
+        }catch (DSOutOfServiceException e){
+            throw new ExecutionException("Not logged in; Can't instantiate "
+                    + type.getSimpleName(), e);
+        }
+        return (T) cache.get(type.getSimpleName() + ":" +serverHost, new Callable<Facility>() {
 
             @Override
             public Facility call() throws Exception {