Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v diff -u -r1.48.2.7 -r1.48.2.8 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 14 Jul 2015 14:16:36 -0000 1.48.2.7 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 17 Jul 2015 11:40:51 -0000 1.48.2.8 @@ -293,9 +293,6 @@ @Override public Assessment getAssessmentByContentId(Long contentId) { Assessment rs = assessmentDao.getByContentId(contentId); - if (rs == null) { - AssessmentServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java,v diff -u -r1.21.2.1 -r1.21.2.2 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 3 Jul 2015 20:35:18 -0000 1.21.2.1 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 17 Jul 2015 11:40:49 -0000 1.21.2.2 @@ -273,9 +273,6 @@ @Override public Daco getDacoByContentId(Long contentId) { Daco daco = dacoDao.getByContentId(contentId); - if (daco == null) { - DacoServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return daco; } Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java,v diff -u -r1.13.2.1 -r1.13.2.2 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java 3 Jul 2015 20:35:22 -0000 1.13.2.1 +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java 17 Jul 2015 11:40:53 -0000 1.13.2.2 @@ -246,9 +246,6 @@ public Eadventure getEadventureByContentId(Long contentId) { Eadventure rs = eadventureDao.getByContentId(contentId); - if (rs == null) { - EadventureServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v diff -u -r1.31.2.6 -r1.31.2.7 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 3 Jul 2015 20:35:39 -0000 1.31.2.6 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 17 Jul 2015 11:40:55 -0000 1.31.2.7 @@ -169,9 +169,6 @@ @Override public ImageGallery getImageGalleryByContentId(Long contentId) { ImageGallery rs = imageGalleryDao.getByContentId(contentId); - if (rs == null) { - ImageGalleryServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java,v diff -u -r1.9.2.1 -r1.9.2.2 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java 3 Jul 2015 20:35:27 -0000 1.9.2.1 +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java 17 Jul 2015 11:40:52 -0000 1.9.2.2 @@ -229,9 +229,6 @@ public CommonCartridge getCommonCartridgeByContentId(Long contentId) { CommonCartridge rs = commonCartridgeDao.getByContentId(contentId); - if (rs == null) { - CommonCartridgeServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v diff -u -r1.77.2.3 -r1.77.2.4 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 3 Jul 2015 20:35:15 -0000 1.77.2.3 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 17 Jul 2015 11:40:44 -0000 1.77.2.4 @@ -236,9 +236,6 @@ @Override public Resource getResourceByContentId(Long contentId) { Resource rs = resourceDao.getByContentId(contentId); - if (rs == null) { - ResourceServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.94.2.3 -r1.94.2.4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 3 Jul 2015 20:35:25 -0000 1.94.2.3 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 17 Jul 2015 11:40:50 -0000 1.94.2.4 @@ -361,9 +361,6 @@ } catch (Exception e) { SubmitFilesService.log.error("Could not find the content by given ID:" + contentID + ". Excpetion is " + e); } - if (content == null) { - SubmitFilesService.log.error("Could not find the content by given ID:" + contentID); - } return content; } @@ -490,7 +487,6 @@ } } - /** Remove a tool session. The session parameter must not be null. */ private void removeToolSession(SubmitFilesSession session) { Set filesUploaded = session.getSubmissionDetails(); if (filesUploaded != null) { Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v diff -u -r1.51.2.6 -r1.51.2.7 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 3 Jul 2015 20:35:32 -0000 1.51.2.6 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 17 Jul 2015 11:40:48 -0000 1.51.2.7 @@ -156,9 +156,6 @@ @Override public Scratchie getScratchieByContentId(Long contentId) { Scratchie rs = scratchieDao.getByContentId(contentId); - if (rs == null) { - ScratchieServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v diff -u -r1.14.2.1 -r1.14.2.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 3 Jul 2015 20:34:47 -0000 1.14.2.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 17 Jul 2015 11:40:47 -0000 1.14.2.2 @@ -121,9 +121,6 @@ public Spreadsheet getSpreadsheetByContentId(Long contentId) { Spreadsheet rs = spreadsheetDao.getByContentId(contentId); - if (rs == null) { - SpreadsheetServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v diff -u -r1.37.2.4 -r1.37.2.5 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 5 Jul 2015 16:16:59 -0000 1.37.2.4 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 17 Jul 2015 11:40:54 -0000 1.37.2.5 @@ -143,9 +143,6 @@ @Override public Survey getSurveyByContentId(Long contentId) { Survey rs = surveyDao.getByContentId(contentId); - if (rs == null) { - SurveyServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java,v diff -u -r1.37.2.1 -r1.37.2.2 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 3 Jul 2015 20:35:03 -0000 1.37.2.1 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 17 Jul 2015 11:40:46 -0000 1.37.2.2 @@ -121,9 +121,6 @@ @Override public TaskList getTaskListByContentId(Long contentId) { TaskList rs = taskListDao.getByContentId(contentId); - if (rs == null) { - TaskListServiceImpl.log.debug("Could not find the content by given ID:" + contentId); - } return rs; }