ba0e1190 by Ean Schuessler

Merge branch 'BF-3725' of /home/git/repositories/brainfood/ofbiz-directcontrolservlet

2 parents 50cfb506 74559e91
......@@ -189,13 +189,14 @@ public class DirectControlServlet extends HttpServlet {
)
);
if (authTokenEntity != null &&
authTokenEntity.get("userLoginId") != null) {
if (authTokenEntity != null) {
String userLoginId = authTokenEntity.getString("userLoginId");
if (UtilValidate.isNotEmpty(userLoginId)) {
GenericValue userLogin = EntityUtil.getFirst(
delegator.findList("UserLogin",
EntityCondition.makeCondition("userLoginId",
EntityOperator.EQUALS,
authTokenEntity.get("userLoginId")),
userLoginId.toLowerCase()),
null, null, null, true));
if (userLogin != null) {
context.put("userLogin", userLogin);
......@@ -207,6 +208,7 @@ public class DirectControlServlet extends HttpServlet {
}
}
}
}
Debug.logInfo("USERLOGIN " + context.get("userLogin") + " AUTHTOKEN " + authToken, module);
......