libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

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

Browse source 
https://issues.jboss.org/browse/KEYCLOAK-892
This commit is contained in:
gerbermichi 2014-12-16 18:44:09 +01:00
parent 919a4c661b
commit c34b3a8017
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
View file

@ -104,23 +104,24 @@ public class KeycloakApplication extends Application {
public static void loadConfig() {
try {
URL config = null;
JsonNode node = null;
String configDir = System.getProperty("jboss.server.config.dir");
if (configDir != null) {
File f = new File(configDir + File.separator + "keycloak-server.json");
if (f.isFile()) {
config = f.toURI().toURL();
node = new ObjectMapper().readTree(f);
log.info("Loaded config from " + f.getAbsolutePath());
}
}
if (config == null) {
config = Thread.currentThread().getContextClassLoader().getResource("META-INF/keycloak-server.json");
if (node == null) {
URL resource = Thread.currentThread().getContextClassLoader().getResource("META-INF/keycloak-server.json");
node = new ObjectMapper().readTree(resource);
log.info("Loaded config from " + resource);
}
if (config != null) {
JsonNode node = new ObjectMapper().readTree(config);
if (node != null) {
Properties properties = new Properties();
properties.putAll(System.getProperties());
for(Map.Entry<String, String> e : System.getenv().entrySet()) {
@ -129,7 +130,6 @@ public class KeycloakApplication extends Application {
Config.init(new JsonConfigProvider(node, properties));
log.info("Loaded config from " + config);
return;
} else {
log.warn("Config 'keycloak-server.json' not found");