From a91f9d008cb2be3dc6e2898bb59d19bfbc45fe27 Mon Sep 17 00:00:00 2001 From: ray Date: Wed, 5 Jan 2005 23:58:23 +0000 Subject: [PATCH] Don't choke if the specified password is null (because we're automatically logging someone in). git-svn-id: https://samskivert.googlecode.com/svn/trunk@1564 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../src/java/com/samskivert/servlet/user/UserManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/samskivert/src/java/com/samskivert/servlet/user/UserManager.java b/projects/samskivert/src/java/com/samskivert/servlet/user/UserManager.java index 42621e78..8310e42a 100644 --- a/projects/samskivert/src/java/com/samskivert/servlet/user/UserManager.java +++ b/projects/samskivert/src/java/com/samskivert/servlet/user/UserManager.java @@ -245,7 +245,7 @@ public class UserManager } // potentially convert the user's legacy password - if (password.getCleartext() != null && + if (password != null && password.getCleartext() != null && user.updateLegacyPassword(password.getCleartext())) { Log.info("Updated legacy password " + user.username + "."); _repository.updateUser(user);