keycloak-memoizeit

Return null for selected provider if empty string

6/24/2014 1:44:30 PM

Stian Thorgersen

Commit: 711b8ca

Tree: ee4a47f

Parents: 34a1923

Changes

core/src/main/java/org/keycloak/Config.java 7(+6 -1)

project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json 2(+1 -1)

server/src/main/resources/META-INF/keycloak-server.json 2(+1 -1)

testsuite/integration/src/main/resources/META-INF/keycloak-server.json 2(+1 -1)

testsuite/tools/src/main/resources/META-INF/keycloak-server.json 2(+1 -1)

Details

core/src/main/java/org/keycloak/Config.java 7(+6 -1)

diff --git a/core/src/main/java/org/keycloak/Config.java b/core/src/main/java/org/keycloak/Config.java
index 16a320c..f26c851 100755
--- a/core/src/main/java/org/keycloak/Config.java
+++ b/core/src/main/java/org/keycloak/Config.java
@@ -16,7 +16,12 @@ public class Config {
     }
 
     public static String getProvider(String spi) {
-        return configProvider.getProvider(spi);
+        String provider = configProvider.getProvider(spi);
+        if (provider == null || provider.trim().equals("")) {
+            return null;
+        } else {
+            return provider;
+        }
     }
 
     public static Scope scope(String... scope) {

project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json 2(+1 -1)

diff --git a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json
index e321f7f..752704c 100755
--- a/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json
+++ b/project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/classes/META-INF/keycloak-server.json
@@ -8,7 +8,7 @@
     },
 
     "modelCache": {
-        "provider": "${keycloak.model.cache.provider:simple}"
+        "provider": "${keycloak.model.cache.provider:}"
     },
 
     "timer": {

server/src/main/resources/META-INF/keycloak-server.json 2(+1 -1)

diff --git a/server/src/main/resources/META-INF/keycloak-server.json b/server/src/main/resources/META-INF/keycloak-server.json
index 0d93c8e..7e3f246 100755
--- a/server/src/main/resources/META-INF/keycloak-server.json
+++ b/server/src/main/resources/META-INF/keycloak-server.json
@@ -15,7 +15,7 @@
     },
 
     "modelCache": {
-        "provider": "${keycloak.model.cache.provider:simple}"
+        "provider": "${keycloak.model.cache.provider:}"
     },
 
     "timer": {

testsuite/integration/src/main/resources/META-INF/keycloak-server.json 2(+1 -1)

diff --git a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
index a7aadb4..b51cee6 100755
--- a/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
+++ b/testsuite/integration/src/main/resources/META-INF/keycloak-server.json
@@ -24,7 +24,7 @@
     },
 
     "modelCache": {
-        "provider": "${keycloak.model.cache.provider:none}"
+        "provider": "${keycloak.model.cache.provider:}"
     },
 
     "timer": {

testsuite/tools/src/main/resources/META-INF/keycloak-server.json 2(+1 -1)

diff --git a/testsuite/tools/src/main/resources/META-INF/keycloak-server.json b/testsuite/tools/src/main/resources/META-INF/keycloak-server.json
index 0d93c8e..7e3f246 100755
--- a/testsuite/tools/src/main/resources/META-INF/keycloak-server.json
+++ b/testsuite/tools/src/main/resources/META-INF/keycloak-server.json
@@ -15,7 +15,7 @@
     },
 
     "modelCache": {
-        "provider": "${keycloak.model.cache.provider:simple}"
+        "provider": "${keycloak.model.cache.provider:}"
     },
 
     "timer": {