Don't use a singleton instance of keycloak, but create one each time

getInstance() is called.

@@ -32,7 +32,7 @@ class KeycloakToolFactory implements ToolFactory<Keycloak> {
     protected final static Logger logger = LoggerFactory.getLogger(KeycloakToolFactory.class)
     protected final static Logger logger = LoggerFactory.getLogger(KeycloakToolFactory.class)
     final static String TOOL_NAME = "Keycloak"
     final static String TOOL_NAME = "Keycloak"
 
 
-    protected Keycloak keycloak = null
+    protected KeycloakBuilder keycloakBuilder = null
 
 
     KeycloakToolFactory() { }
     KeycloakToolFactory() { }
 
 
@@ -44,34 +44,33 @@ class KeycloakToolFactory implements ToolFactory<Keycloak> {
     @Override
     @Override
     void init(ExecutionContextFactory ecf) {
     void init(ExecutionContextFactory ecf) {
         logger.info("Starting Keycloak")
         logger.info("Starting Keycloak")
+        Keycloak keycloak = getInstance()
         try {
         try {
             ServerInfoRepresentation serverInfo = keycloak.serverInfo().getInfo()
             ServerInfoRepresentation serverInfo = keycloak.serverInfo().getInfo()
         } catch (Exception e) {
         } catch (Exception e) {
             logger.error("Could not connect to keycloak server")
             logger.error("Could not connect to keycloak server")
             throw e
             throw e
+        } finally {
+            keycloak.close()
         }
         }
     }
     }
 
 
     @Override
     @Override
     void preFacadeInit(ExecutionContextFactory ecf) {
     void preFacadeInit(ExecutionContextFactory ecf) {
-        this.keycloak = KeycloakBuilder.builder()
+        this.keycloakBuilder = KeycloakBuilder.builder()
             .serverUrl((String) System.getProperty("moqui_keycloak_server_url"))
             .serverUrl((String) System.getProperty("moqui_keycloak_server_url"))
             .realm((String) System.getProperty("moqui_keycloak_realm"))
             .realm((String) System.getProperty("moqui_keycloak_realm"))
             .grantType((String) OAuth2Constants.CLIENT_CREDENTIALS)
             .grantType((String) OAuth2Constants.CLIENT_CREDENTIALS)
             .clientId((String) System.getProperty("moqui_keycloak_client_id"))
             .clientId((String) System.getProperty("moqui_keycloak_client_id"))
             .clientSecret((String) System.getProperty("moqui_keycloak_client_secret"))
             .clientSecret((String) System.getProperty("moqui_keycloak_client_secret"))
-            .build()
     }
     }
 
 
     @Override
     @Override
     Keycloak getInstance(Object... parameters) {
     Keycloak getInstance(Object... parameters) {
-        return keycloak
+        return keycloakBuilder.build()
     }
     }
 
 
     @Override
     @Override
     void destroy() {
     void destroy() {
-        if (keycloak != null) {
-            keycloak.close()
-        }
     }
     }
 }
 }