Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -rff9b1c659da59060b4690a29bfdd493e8741b224 -rd2fae62bad612aad30c914422eea4e0316fc4be1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision ff9b1c659da59060b4690a29bfdd493e8741b224) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision d2fae62bad612aad30c914422eea4e0316fc4be1) @@ -1138,22 +1138,6 @@ } @Override - public AssessmentResult getLastFinishedAssessmentResultNotFromChache(Long assessmentUid, Long userId) { - AssessmentResult finishedResult = getLastFinishedAssessmentResult(assessmentUid, userId); - - //in case user played tricks with accessing Assessment using two tabs, finishedResult can be null and thus we need to request the last *not finished* result - if (finishedResult == null) { - AssessmentResult notFinishedResult = getLastAssessmentResult(assessmentUid, userId); - assessmentDao.releaseFromCache(notFinishedResult); - return getLastAssessmentResult(assessmentUid, userId); - - } else { - assessmentDao.releaseFromCache(finishedResult); - return getLastFinishedAssessmentResult(assessmentUid, userId); - } - } - - @Override public int getAssessmentResultCount(Long assessmentUid, Long userId) { return assessmentResultDao.getAssessmentResultCount(assessmentUid, userId); } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java =================================================================== diff -u -rff9b1c659da59060b4690a29bfdd493e8741b224 -rd2fae62bad612aad30c914422eea4e0316fc4be1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision ff9b1c659da59060b4690a29bfdd493e8741b224) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision d2fae62bad612aad30c914422eea4e0316fc4be1) @@ -326,16 +326,6 @@ int countAttemptsPerOption(Long toolContentId, Long optionUid, boolean finishedAttemptsOnly); /** - * Return the latest *finished* result (the same as the method above). But previously evicting it from the cache. It - * might be useful in cases when we modify result and the use it during one request. - * - * @param assessmentUid - * @param userId - * @return - */ - AssessmentResult getLastFinishedAssessmentResultNotFromChache(Long assessmentUid, Long userId); - - /** * Return number of finished results. I.e. don't count the last not-yet-finished result (it can be autosave one). * * @param assessmentUid Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java =================================================================== diff -u -r468734d3c36d110b296183b7a96c77ebf7c382eb -rd2fae62bad612aad30c914422eea4e0316fc4be1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 468734d3c36d110b296183b7a96c77ebf7c382eb) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision d2fae62bad612aad30c914422eea4e0316fc4be1) @@ -1038,8 +1038,7 @@ int dbResultCount = service.getAssessmentResultCount(assessment.getUid(), userId); if (dbResultCount > 0) { - // release object from the cache (it's required when we have modified result object in the same request) - AssessmentResult result = service.getLastFinishedAssessmentResultNotFromChache(assessment.getUid(), userId); + AssessmentResult result = service.getLastFinishedAssessmentResult(assessment.getUid(), userId); Map questionToResultMap = result.getQuestionResults().stream() .collect(Collectors.toMap(q -> q.getQbToolQuestion().getUid(), q -> q));