From d18806f2dfc1f6f3b3a1c224874a6f26ad5b8b43 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 11 May 2011 16:55:53 +0000
Subject: [PATCH] NIHVIVO-2601 Fix admin login controller so it correctly
 handles forced password changes.

---
 .../webapp/controller/authenticate/AdminLoginController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
index 5f1a6b780..ec5adcd0c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
@@ -97,7 +97,7 @@ public class AdminLoginController extends FreemarkerHttpServlet {
 			if (auth.isCurrentPassword(username, password)) {
 				auth.recordLoginAgainstUserAccount(username, INTERNAL);
 
-				if (auth.isPasswordChangeRequired(username)) {
+				if (!newPassword.isEmpty()) {
 					auth.recordNewPassword(username, newPassword);
 				}