From 2c4ef0be76419b8ff6977d37fab804b3e5f440b4 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 29 Jan 2013 10:31:12 +0100
Subject: [PATCH] OO-520: double check before deleting the temporary key to
 change the password

---
 src/main/java/org/olat/registration/RegistrationManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/olat/registration/RegistrationManager.java b/src/main/java/org/olat/registration/RegistrationManager.java
index 173b54a1584..1eb978c9f8a 100644
--- a/src/main/java/org/olat/registration/RegistrationManager.java
+++ b/src/main/java/org/olat/registration/RegistrationManager.java
@@ -317,7 +317,9 @@ public class RegistrationManager extends BasicManager {
 	 */
 	public void deleteTemporaryKeyWithId(String keyValue) {
 		TemporaryKeyImpl tKey = loadTemporaryKeyByRegistrationKey(keyValue);
-		deleteTemporaryKey(tKey);
+		if(tKey != null) {
+			deleteTemporaryKey(tKey);
+		}
 	}
 
 	/**
-- 
GitLab