From 5e4d173f1d0c54daafd00311ae6f594c98817eab Mon Sep 17 00:00:00 2001
From: Ingo Bauersachs <ingo@jitsi.org>
Date: Fri, 20 Apr 2018 09:24:12 +0200
Subject: [PATCH] KEYCLOAK-7194: avoid NullPointerException (#5157)

---
 .../keycloak/storage/ldap/LDAPStorageProviderFactory.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java
index a401e9ceb8..b3ed27a9d0 100755
--- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java
+++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java
@@ -561,7 +561,10 @@ public class LDAPStorageProviderFactory implements UserStorageProviderFactory<LD
                                     LDAPStorageMapper ldapMapper = ldapFedProvider.getMapperManager().getMapper(mapperModel);
                                     ldapMapper.onImportUserFromLDAP(ldapUser, currentUser, currentRealm, false);
                                 }
-                                session.userCache().evict(currentRealm, currentUser);
+                                UserCache userCache = session.userCache();
+                                if (userCache != null) {
+                                    userCache.evict(currentRealm, currentUser);
+                                }
                                 logger.debugf("Updated user from LDAP: %s", currentUser.getUsername());
                                 syncResult.increaseUpdated();
                             } else {