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 a982edc866d04f267aabeb94d0568f25ded16b5c..61b31771a4e3ed74f7831f5bab2f081a3beca25c 100644 (file)
--- 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