From a09e4893186f65d8512efe3aa46a7d3794b54ab7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 29 Aug 2016 14:39:15 +0200 Subject: [PATCH] Please cherry-pick: - use null-safe Objects.equals() --- .../jjobs/beans/login/JobsUserLoginWebSessionBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java index 0f28b526..20bd3fa0 100644 --- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java @@ -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 -- 2.39.5