Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== diff -u -re5049e0948ac38f849ed086dfa9b8b7dfd8d76ae -r63a9aa3781aa91aec33ee6dacebe649d0d0cd0b2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision e5049e0948ac38f849ed086dfa9b8b7dfd8d76ae) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (.../LearnerService.java) (revision 63a9aa3781aa91aec33ee6dacebe649d0d0cd0b2) @@ -181,7 +181,7 @@ */ public LessonDTO[] getActiveLessonsFor(Integer learnerId) { - User learner = userManagementService.getUserById(learnerId); + User learner = (User)userManagementService.findById(User.class,learnerId); List activeLessons = this.lessonDAO.getActiveLessonsForLearner(learner); return getLessonDataFor(activeLessons); } @@ -221,7 +221,7 @@ */ public LearnerProgress joinLesson(Integer learnerId, Long lessonID) { - User learner = userManagementService.getUserById(learnerId); + User learner = (User)userManagementService.findById(User.class,learnerId); Lesson lesson = getLesson(lessonID); LearnerProgress learnerProgress = learnerProgressDAO.getLearnerProgressByLearner(learner.getUserId(),lessonID); @@ -404,7 +404,7 @@ public boolean performGrouping(Long lessonId, Long groupingActivityId, Integer learnerId, boolean forceGrouping) throws LearnerServiceException { GroupingActivity groupingActivity = (GroupingActivity) activityDAO.getActivityByActivityId(groupingActivityId, GroupingActivity.class); - User learner = userManagementService.getUserById(learnerId); + User learner = (User)userManagementService.findById(User.class,learnerId); boolean groupingDone = false; try { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== diff -u -re5049e0948ac38f849ed086dfa9b8b7dfd8d76ae -r63a9aa3781aa91aec33ee6dacebe649d0d0cd0b2 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision e5049e0948ac38f849ed086dfa9b8b7dfd8d76ae) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 63a9aa3781aa91aec33ee6dacebe649d0d0cd0b2) @@ -371,7 +371,7 @@ //getting requested object according to coming parameters Integer learnerId = LearningWebUtil.getUserId(); - User learner = LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).getUserById(learnerId); + User learner = (User)LearnerServiceProxy.getUserManagementService(getServlet().getServletContext()).findById(User.class,learnerId); Activity requestedActivity = learnerService.getActivity(new Long(activityId));