keycloak-aplcache

Bugfix: Can not read keycloak-server.json if the path contains

12/16/2014 3:54:48 PM

Details

diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
index 0e72e39..89874e6 100755
--- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
+++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
@@ -110,15 +110,15 @@ public class KeycloakApplication extends Application {
             if (configDir != null) {
                 File f = new File(configDir + File.separator + "keycloak-server.json");
                 if (f.isFile()) {
+                    log.info("Load config from " + f.getAbsolutePath());
                     node = new ObjectMapper().readTree(f);
-                    log.info("Loaded config from " + f.getAbsolutePath());
                 }
             }
 
             if (node == null) {
                 URL resource = Thread.currentThread().getContextClassLoader().getResource("META-INF/keycloak-server.json");
+                log.info("Load config from " + resource);
                 node = new ObjectMapper().readTree(resource);
-                log.info("Loaded config from " + resource);
             }
 
             if (node != null) {