Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java =================================================================== diff -u -r44f25ff763552baf103b1bb4ed7d1d2466a937dc -r587ed647f8d1a0410710ce167369607c1eb57c45 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision 44f25ff763552baf103b1bb4ed7d1d2466a937dc) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java (.../HomeController.java) (revision 587ed647f8d1a0410710ce167369607c1eb57c45) @@ -191,8 +191,7 @@ serverURLContextPath = serverURLContextPath.startsWith("/") ? serverURLContextPath : "/" + serverURLContextPath; serverURLContextPath += serverURLContextPath.endsWith("/") ? "" : "/"; - applicationcontext.getServletContext().getContext(serverURLContextPath + "learning") - .getRequestDispatcher("/welcome.jsp?lessonID=" + lessonId).forward(req, res); + res.sendRedirect(serverURLContextPath + "learning/welcome.jsp?lessonID=" + lessonId); return null; } catch (Exception e) { @@ -293,7 +292,7 @@ // find lessons which can be set as preceding ones for newly created lesson Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, organisationID); Set availableLessons = new TreeSet<>(new LessonDTOComparator()); - for (Lesson availableLesson : (Set) organisation.getLessons()) { + for (Lesson availableLesson : organisation.getLessons()) { Integer availableLessonState = availableLesson.getLessonStateId(); if (!Lesson.REMOVED_STATE.equals(availableLessonState) && !Lesson.FINISHED_STATE.equals(availableLessonState)) { @@ -372,5 +371,5 @@ private User getRealUser(UserDTO dto) { return userManagementService.getUserByLogin(dto.getLogin()); - } + } } \ No newline at end of file