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 a9012f2542c840a93737b031f9096f47f41bea4b..7b348adab7f19f36ada4f9266331c266b0f7b793 100644 (file)
--- 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);