Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java,v
diff -u -r1.15 -r1.16
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	25 Dec 2008 14:28:02 -0000	1.15
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java	23 Jan 2009 19:39:32 -0000	1.16
@@ -438,8 +438,9 @@
 
 	if (imageGallery.isAllowCommentImages()) {
 	    TreeSet<ImageComment> comments = new TreeSet<ImageComment>(new ImageCommentComparator());
+	    Set<ImageComment> dbComments = image.getComments();
 	    List<ImageGalleryUser> sessionUsers = service.getUserListBySessionId(sessionId);
-	    for(ImageComment comment : comments) {
+	    for(ImageComment comment : dbComments) {
 		for(ImageGalleryUser sessionUser : sessionUsers) {
 		    if (comment.getCreateBy().getUserId().equals(sessionUser.getUserId())) {
 			comments.add(comment);
@@ -510,9 +511,17 @@
 	dbComments.add(comment);
 	service.saveOrUpdateImageGalleryItem(dbItem);
 			
-	//to make available new changes be visible in jsp page
+	// to make available new changes be visible in jsp page
 	TreeSet<ImageComment> comments = new TreeSet<ImageComment>(new ImageCommentComparator());
-	comments.addAll(dbItem.getComments());
+	dbComments = dbItem.getComments();
+	List<ImageGalleryUser> sessionUsers = service.getUserListBySessionId(sessionId);
+	for (ImageComment dbComment : dbComments) {
+	    for (ImageGalleryUser sessionUser : sessionUsers) {
+		if (dbComment.getCreateBy().getUserId().equals(sessionUser.getUserId())) {
+		    comments.add(dbComment);
+		}
+	    }
+	}
 	sessionMap.put(ImageGalleryConstants.PARAM_COMMENTS, comments);
 	
 	form.reset(mapping, request);