keycloak-aplcache

KEYCLOAK-1507 Tomcat Adapter throws NPE under certain conditions

7/2/2015 4:08:40 AM

Stian Thorgersen

Changes

integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java 4(+3 -1)

Details

integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java 4(+3 -1)

diff --git a/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java b/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java
index f415f9f..7088b46 100755
--- a/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java
+++ b/integration/tomcat/tomcat-core/src/main/java/org/keycloak/adapters/tomcat/AbstractKeycloakAuthenticatorValve.java
@@ -127,7 +127,9 @@ public abstract class AbstractKeycloakAuthenticatorValve extends FormAuthenticat
     }
 
     protected void beforeStop() {
-        nodesRegistrationManagement.stop();
+        if (nodesRegistrationManagement != null) {
+            nodesRegistrationManagement.stop();
+        }
     }
 
     private static InputStream getJSONFromServletContext(ServletContext servletContext) {