From fdc988270923a1067ce98717abe1dd54668443f5 Mon Sep 17 00:00:00 2001
From: Grzegorz Grzybek <gr.grzybek@gmail.com>
Date: Mon, 20 Aug 2018 18:36:56 +0200
Subject: [PATCH] [KEYCLOAK-8101] Return just cached deployment to prevent NPE

---
 .../keycloak/adapters/osgi/PathBasedKeycloakConfigResolver.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/adapters/oidc/osgi-adapter/src/main/java/org/keycloak/adapters/osgi/PathBasedKeycloakConfigResolver.java b/adapters/oidc/osgi-adapter/src/main/java/org/keycloak/adapters/osgi/PathBasedKeycloakConfigResolver.java
index a2eaba9271..35f43de62a 100644
--- a/adapters/oidc/osgi-adapter/src/main/java/org/keycloak/adapters/osgi/PathBasedKeycloakConfigResolver.java
+++ b/adapters/oidc/osgi-adapter/src/main/java/org/keycloak/adapters/osgi/PathBasedKeycloakConfigResolver.java
@@ -87,6 +87,7 @@ public class PathBasedKeycloakConfigResolver implements KeycloakConfigResolver {
             if (!cacheConfiguration(pathFragment, configuration)) {
                 throw new IllegalStateException("Not able to read the file " + configuration);
             }
+            deployment = getCachedDeployment(pathFragment);
         }
 
         return deployment;