]> git.mxchange.org Git - jjobs-war.git/commitdiff
Please cherry-pick:
authorRoland Häder <roland@mxchange.org>
Mon, 29 Aug 2016 12:39:15 +0000 (14:39 +0200)
committerRoland Haeder <roland@mxchange.org>
Mon, 29 Aug 2016 17:31:14 +0000 (19:31 +0200)
- use null-safe Objects.equals()

src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java

index 0f28b52667ad0017a34509e4cb86a9fd0ad53d2a..20bd3fa08826a5bfa9c5ab0207bfd6f1d15b005b 100644 (file)
@@ -329,7 +329,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J
 
        @Override
        public boolean ifUserMustChangePassword () {
-               return (this.isUserLoggedIn() && this.getLoggedInUser().getUserMustChangePassword());
+               return ((this.isUserLoggedIn()) && (Objects.equals(this.getLoggedInUser().getUserMustChangePassword(), Boolean.TRUE)));
        }
 
        @Override
@@ -341,7 +341,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J
                }
 
                // Check logged-in first, then invisibility
-               return this.getLoggedInUser().getUserProfileMode().equals(ProfileMode.INVISIBLE);
+               return Objects.equals(this.getLoggedInUser().getUserProfileMode(), ProfileMode.INVISIBLE);
        }
 
        @Override