From: Roland Häder <roland@mxchange.org>
Date: Tue, 30 Aug 2016 10:57:47 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=00e21400f78547c5b10f6fe82c5f6dbe0b665469;p=jjobs-war.git

Please cherry-pick:
- do always clear current password in other controller
---

diff --git a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
index a982edc8..61b31771 100644
--- a/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
+++ b/src/java/org/mxchange/jjobs/beans/user/password/JobsUserPasswordWebRequestBean.java
@@ -126,6 +126,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement
 			this.showFacesMessage("form_user_change_password:userCurrentPassword", "ERROR_USER_CURRENT_PASSWORD_MISMATCHING"); //NOI18N
 
 			// Clear bean
+			this.userLoginController.setUserCurrentPassword(null);
 			this.clear();
 
 			// No redirect
@@ -135,6 +136,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement
 			this.showFacesMessage("form_user_change_password:userPasswordRepeat", "ERROR_USER_NEW_PASSWORDS_MISMATCH"); //NOI18N
 
 			// Clear bean
+			this.userLoginController.setUserCurrentPassword(null);
 			this.clear();
 
 			// No redirect
@@ -144,6 +146,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement
 			this.showFacesMessage("form_user_change_password:userPassword", "ERROR_USER_NEW_PASSWORD_SAME_AS_CURRENT"); //NOI18N
 
 			// Clear bean
+			this.userLoginController.setUserCurrentPassword(null);
 			this.clear();
 
 			// No redirect
@@ -153,6 +156,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement
 			this.showFacesMessage("form_user_change_password:userPassword", "ERROR_USER_NEW_PASSWORD_ALREADY_ENTERED"); //NOI18N
 
 			// Clear bean
+			this.userLoginController.setUserCurrentPassword(null);
 			this.clear();
 
 			// No redirect
@@ -180,6 +184,7 @@ public class JobsUserPasswordWebRequestBean extends BaseJobsController implement
 			this.userUpdatedPasswordEvent.fire(new UserUpdatedPasswordEvent(passwordHistory));
 		} catch (final UserNotFoundException | UserStatusUnconfirmedException | UserStatusLockedException ex) {
 			// Clear bean
+			this.userLoginController.setUserCurrentPassword(null);
 			this.clear();
 
 			// Throw again