keycloak-uncached

KEYCLOAK-504 Using https results in RuntimeException if

6/6/2014 10:54:11 AM

Details

diff --git a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java
index c44ad67..7d81d3a 100755
--- a/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java
+++ b/integration/adapter-core/src/main/java/org/keycloak/adapters/AdapterDeploymentContext.java
@@ -280,13 +280,13 @@ public class AdapterDeploymentContext {
     protected KeycloakUriBuilder getBaseBuilder(HttpFacade facade, String base) {
         KeycloakUriBuilder builder = KeycloakUriBuilder.fromUri(base);
         URI request = URI.create(facade.getRequest().getURI());
-        String scheme = "http";
+        String scheme = request.getScheme();
         if (deployment.isSslRequired()) {
             scheme = "https";
-        }
-        if (!request.getScheme().equals(scheme) && request.getPort() != -1) {
-            log.error("request scheme: " + request.getScheme() + " ssl required: " + deployment.isSslRequired());
-            throw new RuntimeException("Can't resolve relative url from adapter config.");
+            if (!request.getScheme().equals(scheme) && request.getPort() != -1) {
+                log.error("request scheme: " + request.getScheme() + " ssl required: " + deployment.isSslRequired());
+                throw new RuntimeException("Can't resolve relative url from adapter config.");
+            }
         }
         builder.scheme(scheme);
         builder.host(request.getHost());