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.33 -r1.34
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	2 Feb 2014 17:18:51 -0000	1.33
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java	4 Feb 2014 14:09:50 -0000	1.34
@@ -894,44 +894,44 @@
 	    return;
 	}
 
-	List<TaskListSession> sessions = taskListSessionDao.getByContentId(toolContentId);
-	for (TaskListSession session : sessions) {
-	    Set<TaskListItem> items = session.getTaskListItems();
-	    for (TaskListItem item : items) {
-		if (log.isDebugEnabled()) {
-		    log.debug("Removing visit log, comments and attachments for user ID " + userId + " and item UID "
-			    + item.getUid());
-		}
-		TaskListItemVisitLog visitLog = taskListItemVisitDao.getTaskListItemLog(item.getUid(),
-			userId.longValue());
-		if (visitLog != null) {
-		    taskListDao.removeObject(TaskListItemVisitLog.class, visitLog.getUid());
-		}
+	Set<TaskListItem> items = taskList.getTaskListItems();
+	for (TaskListItem item : items) {
+	    if (log.isDebugEnabled()) {
+		log.debug("Removing visit log, comments and attachments for user ID " + userId + " and item UID "
+			+ item.getUid());
+	    }
 
-		Iterator<TaskListItemAttachment> attachmentIter = item.getAttachments().iterator();
-		while (attachmentIter.hasNext()) {
-		    TaskListItemAttachment attachment = attachmentIter.next();
-		    if (attachment.getCreateBy().getUserId().equals(userId.longValue())) {
-			try {
-			    taskListToolContentHandler.deleteFile(attachment.getFileUuid());
-			} catch (Exception e) {
-			    throw new ToolException("Error while removing Task List attachment", e);
-			}
-			taskListDao.removeObject(TaskListItemAttachment.class, attachment.getUid());
-			attachmentIter.remove();
+	    TaskListItemVisitLog visitLog = taskListItemVisitDao.getTaskListItemLog(item.getUid(), userId.longValue());
+	    if (visitLog != null) {
+		taskListDao.removeObject(TaskListItemVisitLog.class, visitLog.getUid());
+	    }
+
+	    Iterator<TaskListItemAttachment> attachmentIter = item.getAttachments().iterator();
+	    while (attachmentIter.hasNext()) {
+		TaskListItemAttachment attachment = attachmentIter.next();
+		if (attachment.getCreateBy().getUserId().equals(userId.longValue())) {
+		    try {
+			taskListToolContentHandler.deleteFile(attachment.getFileUuid());
+		    } catch (Exception e) {
+			throw new ToolException("Error while removing Task List attachment", e);
 		    }
+		    taskListDao.removeObject(TaskListItemAttachment.class, attachment.getUid());
+		    attachmentIter.remove();
 		}
+	    }
 
-		Iterator<TaskListItemComment> commentIter = item.getComments().iterator();
-		while (commentIter.hasNext()) {
-		    TaskListItemComment comment = commentIter.next();
-		    if (comment.getCreateBy().getUserId().equals(userId.longValue())) {
-			taskListDao.removeObject(TaskListItemComment.class, comment.getUid());
-			commentIter.remove();
-		    }
+	    Iterator<TaskListItemComment> commentIter = item.getComments().iterator();
+	    while (commentIter.hasNext()) {
+		TaskListItemComment comment = commentIter.next();
+		if (comment.getCreateBy().getUserId().equals(userId.longValue())) {
+		    taskListDao.removeObject(TaskListItemComment.class, comment.getUid());
+		    commentIter.remove();
 		}
 	    }
+	}
 
+	List<TaskListSession> sessions = taskListSessionDao.getByContentId(toolContentId);
+	for (TaskListSession session : sessions) {
 	    TaskListUser user = taskListUserDao.getUserByUserIDAndSessionID(userId.longValue(), session.getSessionId());
 	    if (user != null) {
 		user.setSessionFinished(false);