Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	4 Jul 2008 02:36:02 -0000	1.7
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java	4 Jul 2008 05:41:42 -0000	1.8
@@ -126,11 +126,6 @@
 		// Putting in the GmapDTO for the request
 		GmapDTO gmapDTO = new GmapDTO(gmap);
 		request.setAttribute("gmapDTO", gmapDTO);
-		
-		// Putting in a gmap session attribute, along with markers for this session
-		GmapSessionDTO gmapSessionDTO= new GmapSessionDTO(gmapSession);
-		gmapSessionDTO.setMarkerDTOs(gmapService.getGmapMarkersBySessionId(toolSessionID));
-		request.setAttribute("gmapSessionDTO", gmapSessionDTO);
 
 		// Set the content in use flag.
 		if (!gmap.isContentInUse()) {
@@ -154,6 +149,16 @@
 		request.setAttribute(GmapConstants.ATTR_USER_DTO, gmapUserDTO);
 		
 		
+		// Putting in a gmap session attribute, along with markers for this session
+		GmapSessionDTO gmapSessionDTO= new GmapSessionDTO(gmapSession);
+		gmapSessionDTO.setMarkerDTOs(gmapService.getGmapMarkersBySessionId(toolSessionID));
+		if (!gmapSessionDTO.getUserDTOs().contains(gmapUserDTO))
+		{
+			gmapSessionDTO.getUserDTOs().add(gmapUserDTO);
+		}
+		request.setAttribute("gmapSessionDTO", gmapSessionDTO);
+		
+		
 		// set readOnly flag.
 		if (mode.equals(ToolAccessMode.TEACHER) || (gmap.isLockOnFinished() && gmapUser.isFinishedActivity())) {
 			request.setAttribute("contentEditable", false);