Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Attic/Lesson.as,v diff -u -r1.17 -r1.18 Binary files differ Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v diff -u -r1.55 -r1.56 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 12 Sep 2006 07:05:34 -0000 1.55 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 13 Sep 2006 07:11:17 -0000 1.56 @@ -434,14 +434,14 @@ * Exit a lesson. * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#exitLesson(org.lamsfoundation.lams.lesson.LearnerProgress) */ - public void exitLesson(Long progressId) + public void exitLesson(Long lessonId) { - LearnerProgress progress = learnerProgressDAO.getLearnerProgress(progressId); + LearnerProgress progress = learnerProgressDAO.getLearnerProgress(lessonId); if ( progress != null ) { progress.setRestarting(true); learnerProgressDAO.updateLearnerProgress(progress); } else { - String error = "Learner Progress "+progressId+" does not exist. Cannot exit lesson successfully."; + String error = "Learner Progress "+lessonId+" does not exist. Cannot exit lesson successfully."; log.error(error); throw new LearnerServiceException(error); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v diff -u -r1.33 -r1.34 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 25 Jul 2006 06:01:51 -0000 1.33 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 13 Sep 2006 07:11:17 -0000 1.34 @@ -223,15 +223,15 @@ FlashMessage message = null; try { - LearnerProgress learnerProgress = LearningWebUtil.getLearnerProgress(request,learnerService); - + Long lessonID = WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID); + if(log.isDebugEnabled()) - log.debug("Exiting lesson, lesson id is: "+learnerProgress.getLesson().getLessonId()); + log.debug("Exiting lesson, lesson id is: "+lessonID); - learnerService.exitLesson(learnerProgress.getLearnerProgressId()); + learnerService.exitLesson(lessonID); //send acknowledgment to flash as it is triggered by flash - message = new FlashMessage("exitLesson",true); + message = new FlashMessage("exitLesson", true); } catch (Exception e ) { message = handleException(e, "exitLesson", learnerService); Index: lams_learning/web/lams_learner.swf =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v diff -u -r1.45 -r1.46 Binary files differ