Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
diff -u -r9ed689d51b8f41ba820bd7e6be8e3253703096a8 -r517f73c6bb7a808f15a78389449275a845267779
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 9ed689d51b8f41ba820bd7e6be8e3253703096a8)
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java	(.../GmapService.java)	(revision 517f73c6bb7a808f15a78389449275a845267779)
@@ -27,6 +27,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Set;
@@ -263,10 +264,28 @@
 				null);
 		gmap.setToolContentHandler(null);
 		gmap.setGmapSessions(null);
+		gmap.setCreateBy(null);
+		
 		Set<GmapAttachment> atts = gmap.getGmapAttachments();
 		for (GmapAttachment att : atts) {
 			att.setGmap(null);
 		}
+		
+		Set<GmapMarker> markers = gmap.getGmapMarkers();
+		Set<GmapMarker> authorItems = new HashSet<GmapMarker>();
+		
+		for (GmapMarker gmapMarker:markers)
+		{
+			if (gmapMarker.isAuthored())
+			{
+				gmapMarker.setCreatedBy(null);
+				gmapMarker.setGmap(null);
+				gmapMarker.setUpdatedBy(null);
+				authorItems.add(gmapMarker);
+			}
+		}
+		gmap.setGmapMarkers(authorItems);
+
 		try {
 			exportContentService.registerFileClassForExport(
 					GmapAttachment.class.getName(), "fileUuid",