From 9b2e7f6e2c96bc43fef820c141d27bf4dc09b84b Mon Sep 17 00:00:00 2001
From: Sebastian Laskawiec <slaskawi@redhat.com>
Date: Mon, 3 Feb 2020 12:54:07 +0100
Subject: [PATCH] KEYCLOAK-12650 Fix NullPointerException when creating
 HttpClient

---
 .../java/org/keycloak/adapters/KeycloakDeploymentBuilder.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java b/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
index b3a632f53ea..af2a9610312 100755
--- a/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
+++ b/adapters/oidc/adapter-core/src/main/java/org/keycloak/adapters/KeycloakDeploymentBuilder.java
@@ -132,12 +132,10 @@ public class KeycloakDeploymentBuilder {
         if (realmKeyPem == null && adapterConfig.isBearerOnly() && adapterConfig.getAuthServerUrl() == null) {
             throw new IllegalArgumentException("For bearer auth, you must set the realm-public-key or auth-server-url");
         }
-        if (realmKeyPem == null || !deployment.isBearerOnly() || deployment.isSSLEnabled() || deployment.isEnableBasicAuth() || deployment.isRegisterNodeAtStartup() || deployment.getRegisterNodePeriod() != -1) {
-            deployment.setClient(createHttpClientProducer(adapterConfig));
-        }
         if (adapterConfig.getAuthServerUrl() == null && (!deployment.isBearerOnly() || realmKeyPem == null)) {
             throw new RuntimeException("You must specify auth-server-url");
         }
+        deployment.setClient(createHttpClientProducer(adapterConfig));
         deployment.setAuthServerBaseUrl(adapterConfig);
         if (adapterConfig.getTurnOffChangeSessionIdOnLogin() != null) {
             deployment.setTurnOffChangeSessionIdOnLogin(adapterConfig.getTurnOffChangeSessionIdOnLogin());