From: Roland Häder <roland@mxchange.org>
Date: Wed, 3 Aug 2016 09:06:25 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6db08abeb734538fee20f8d13bbc4ac25c402c32;p=addressbook-war.git

Please cherry-pick:
- renamed + sorted field as it is only for user logins

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
index a9012f25..7b348ada 100644
--- a/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/login/AddressbookUserLoginWebSessionBean.java
@@ -90,18 +90,6 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
 	 */
 	private User loggedInUser;
 
-	/**
-	 * EJB for user-login
-	 */
-	private UserLoginSessionBeanRemote loginBean;
-
-	/**
-	 * Event fired when user has logged in
-	 */
-	@Inject
-	@Any
-	private Event<UserLoggedInEvent> loginEvent;
-
 	/**
 	 * User controller
 	 */
@@ -113,6 +101,11 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
 	 */
 	private boolean userLoggedIn;
 
+	/**
+	 * EJB for user-login
+	 */
+	private UserLoginSessionBeanRemote userLoginBean;
+
 	/**
 	 * Event fired when user has logged in
 	 */
@@ -146,7 +139,7 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
 			Context context = new InitialContext();
 
 			// Try to lookup
-			this.loginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/addressbook-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N
+			this.userLoginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/addressbook-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N
 
 			// Also find this
 			this.userPasswordHistoryBean = (UserPasswordHistorySessionBeanRemote) context.lookup(""); //NOI18N
@@ -187,7 +180,7 @@ public class AddressbookUserLoginWebSessionBean extends BaseAddressbookControlle
 
 		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);