From d50522c1092abcb87fce42c2cc58887bc35e0e0b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 22 Aug 2013 14:46:29 +0200
Subject: [PATCH] OO-710: hardened cache for username against null key/value

---
 src/main/java/org/olat/user/UserManagerImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/olat/user/UserManagerImpl.java b/src/main/java/org/olat/user/UserManagerImpl.java
index da0b278e3d2..9cf2ede8c1b 100644
--- a/src/main/java/org/olat/user/UserManagerImpl.java
+++ b/src/main/java/org/olat/user/UserManagerImpl.java
@@ -514,8 +514,12 @@ public class UserManagerImpl extends UserManager {
 	}
 	
 	private void updateUsernameCache(Long identityKey, String username, String fullName) {
-		usernameCache.put(identityKey, fullName);
-		usernameCache.put(username, fullName);
+		if(identityKey != null && fullName != null) {
+			usernameCache.put(identityKey, fullName);
+		}
+		if(username != null && fullName != null) {
+			usernameCache.put(username, fullName);
+		}
 	}
 
 	/**
-- 
GitLab