Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java,v
diff -u -r1.12 -r1.13
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	8 Dec 2008 21:51:27 -0000	1.12
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java	12 Dec 2008 11:02:20 -0000	1.13
@@ -106,7 +106,7 @@
      * @param sessionId
      * @return
      */
-    ImageGalleryUser getUserByIDAndSession(Long long1, Long sessionId);
+    ImageGalleryUser getUserByIDAndSession(Long userId, Long sessionId);
 
     // ********** Repository methods ***********************
     /**
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java,v
diff -u -r1.1 -r1.2
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	4 Dec 2008 12:01:36 -0000	1.1
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryOutputFactory.java	12 Dec 2008 11:02:20 -0000	1.2
@@ -23,6 +23,7 @@
 /* $Id$ */
 package org.lamsfoundation.lams.tool.imageGallery.service;
 
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedMap;
@@ -71,7 +72,7 @@
 	ImageGallerySession session = imageGalleryService.getImageGallerySessionBySessionId(toolSessionId);
 	if (session != null) {
 
-	    ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, session.getUid());
+	    ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, toolSessionId);
 
 	    if (names == null || names.contains(OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED)) {
 		output.put(OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED, getNumUploadedImages(user, session));
@@ -92,7 +93,7 @@
 	    ImageGallerySession session = imageGalleryService.getImageGallerySessionBySessionId(toolSessionId);
 	    if (session != null) {
 
-		ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, session.getUid());
+		ImageGalleryUser user = imageGalleryService.getUserByIDAndSession(learnerId, toolSessionId);
 
 		if (name.equals(OUTPUT_NAME_LEARNER_NUM_IMAGES_UPLOADED)) {
 		    return getNumUploadedImages(user, session);
@@ -138,7 +139,9 @@
 	int countComments = 0;
 	if (user != null) {
 	    Set<ImageGalleryItem> allImages = imageGallery.getImageGalleryItems();
-	    for (ImageGalleryItem image : allImages) {
+	    Iterator<ImageGalleryItem> it = allImages.iterator();
+	    while(it.hasNext()) {
+		ImageGalleryItem image = it.next();
 		Set<ImageComment> imageComments = image.getComments();
 		for (ImageComment comment : imageComments) {
 		    if (user.getUserId().equals(comment.getCreateBy().getUserId())) {