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/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
index fccf1755a989218a18ba646615a490b78295113c..f7808de5d00ec6e94247b4a7cb2ac828bf5571ce 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
+++ b/src/java/org/mxchange/pizzaapplication/beans/login/PizzaUserLoginWebSessionBean.java
@@ -89,18 +89,6 @@ public class PizzaUserLoginWebSessionBean extends BasePizzaController implements
         */
        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
         */
@@ -112,6 +100,11 @@ public class PizzaUserLoginWebSessionBean extends BasePizzaController implements
         */
        private boolean userLoggedIn;
 
+       /**
+        * EJB for user-login
+        */
+       private UserLoginSessionBeanRemote userLoginBean;
+
        /**
         * Event fired when user has logged in
         */
@@ -145,7 +138,7 @@ public class PizzaUserLoginWebSessionBean extends BasePizzaController implements
                        Context context = new InitialContext();
 
                        // Try to lookup
-                       this.loginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N
+                       this.userLoginBean = (UserLoginSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/login!org.mxchange.jusercore.model.login.UserLoginSessionBeanRemote"); //NOI18N
 
                        // Also find this
                        this.userPasswordHistoryBean = (UserPasswordHistorySessionBeanRemote) context.lookup(""); //NOI18N
@@ -186,7 +179,7 @@ public class PizzaUserLoginWebSessionBean extends BasePizzaController implements
 
                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);