Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java,v diff -u -r1.21.2.4 -r1.21.2.5 --- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java 25 Nov 2014 08:43:56 -0000 1.21.2.4 +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java 27 Nov 2014 12:25:40 -0000 1.21.2.5 @@ -120,19 +120,18 @@ langIsoCode, countryIsoCode, email, prefix, isUpdateUserDetails); } - // in case of request for learner with strict authentication check cache should also contain lsid + //in case of request for learner with strict authentication check cache should also contain lsid + String lsId = null; if (LoginRequestDispatcher.METHOD_LEARNER_STRICT_AUTHENTICATION.equals(method)) { - String lsId = request.getParameter(LoginRequestDispatcher.PARAM_LESSON_ID); + + lsId = request.getParameter(LoginRequestDispatcher.PARAM_LESSON_ID); if (lsId == null) { response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Login Failed - lsId parameter missing"); return; } - Authenticator.authenticate(serverMap, timestamp, extUsername, method, lsId, hash); - - } else { - Authenticator.authenticate(serverMap, timestamp, extUsername, method, hash); } - + Authenticator.authenticateLoginRequest(serverMap, timestamp, extUsername, method, lsId, hash); + User user = userMap.getUser(); String login = user.getLogin(); UserDTO loggedInUserDTO = (UserDTO) hses.getAttribute(AttributeNames.USER); Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/webservice/GetServerTimeServlet.java'. Fisheye: No comparison available. Pass `N' to diff?