From ba54757665652b49c9d694f66131d297e978bdd0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 3 Aug 2016 11:06:25 +0200 Subject: [PATCH] Please cherry-pick: - renamed + sorted field as it is only for user logins MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../login/JobsUserLoginWebSessionBean.java | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java index 34387d8a..41d2d2e5 100644 --- a/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/login/JobsUserLoginWebSessionBean.java @@ -81,28 +81,22 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J private User loggedInUser; /** - * EJB for user-login + * User controller */ - private UserLoginSessionBeanRemote loginBean; + @Inject + private JobsUserWebSessionController userController; /** - * Event fired when user has logged in + * Event being fired when user logs in */ @Inject @Any private Event loginEvent; /** - * Template type for pages that might be displayed in guest area and login - * area. Default is guest area. - */ - private String templateType = "guest"; //NOI18N - - /** - * User controller + * EJB for user-login */ - @Inject - private JobsUserWebSessionController userController; + private UserLoginSessionBeanRemote userLoginBean; /** * Flag whether the user has logged-in, set only from inside @@ -128,7 +122,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J Context context = new InitialContext(); // Try to lookup - this.loginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/jjobs-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N + this.userLoginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/jjobs-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N // Also find this this.userPasswordHistoryBean = (UserPasswordHistorySessionBeanRemote) context.lookup(""); //NOI18N @@ -151,7 +145,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J try { // Call bean - User confirmedUser = this.loginBean.validateUserAccountStatus(container); + User confirmedUser = this.userLoginBean.validateUserAccountStatus(container); // All fine here so set it here this.setLoggedInUser(confirmedUser); @@ -248,7 +242,6 @@ public class JobsUserLoginWebSessionBean extends BaseJobsController implements J // Trace message // NOISY-DEBUG System.out.println(MessageFormat.format("JobsUserLoginWebSessionBean:isUserLoggedIn: this.userLoggedIn={0} - EXIT!", this.userLoggedIn)); - // Return it return this.userLoggedIn; } -- 2.39.5