Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/InstructionFiles.java,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	18 Nov 2005 04:42:32 -0000	1.6
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.java	28 Nov 2005 22:51:32 -0000	1.7
@@ -83,6 +83,8 @@
 		Object obj = null;
 		try {
 			obj = super.clone();
+			//never clone key!
+			((InstructionFiles)obj).setUid(null);
 		} catch (CloneNotSupportedException e) {
 			log.error("When clone " + InstructionFiles.class + " failed");
 		}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java,v
diff -u -r1.10 -r1.11
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	3 Aug 2005 06:19:03 -0000	1.10
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.java	28 Nov 2005 22:51:32 -0000	1.11
@@ -175,6 +175,8 @@
 		Object obj = null;
 		try {
 			obj = super.clone();
+			//never clone key!
+			((SubmissionDetails)obj).setSubmissionID(null);
 			if(this.report != null)
 				((SubmissionDetails)obj).report = (SubmitFilesReport) this.report.clone();
 		} catch (CloneNotSupportedException e) {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java,v
diff -u -r1.8 -r1.9
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	28 Jul 2005 07:25:53 -0000	1.8
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	28 Nov 2005 22:51:32 -0000	1.9
@@ -302,6 +302,8 @@
 		Object obj = null;
 		try {
 			obj = super.clone();
+			//never clone key!
+			((SubmitFilesContent)obj).setContentID(null);
 			//clone SubmitFIleSession object
 			if(toolSession != null ){
 				Iterator iter = toolSession.iterator();
@@ -319,7 +321,7 @@
 				((SubmitFilesContent)obj).instructionFiles= set;
 			}
 		} catch (CloneNotSupportedException e) {
-			log.error("When clone " + SubmissionDetails.class + " failed");
+			log.error("When clone " + SubmitFilesContent.class + " failed");
 		}
 		
 		return obj;
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	26 Jul 2005 07:05:26 -0000	1.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.java	28 Nov 2005 22:51:32 -0000	1.6
@@ -101,6 +101,8 @@
 		Object obj = null;
 		try {
 			obj = super.clone();
+			//never clone key!
+			((SubmitFilesReport)obj).setReportID(null);
 		} catch (CloneNotSupportedException e) {
 			log.error("When clone " + SubmitFilesReport.class + " failed");
 		}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java,v
diff -u -r1.10 -r1.11
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	3 Aug 2005 06:19:03 -0000	1.10
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.java	28 Nov 2005 22:51:32 -0000	1.11
@@ -103,6 +103,8 @@
 		Object obj = null;
 		try {
 			obj = super.clone();
+			//never clone key!
+			((SubmitFilesSession)obj).setSessionID(null);
 			//clone SubmissionDetails object
 			if(submissionDetails != null){
 				Iterator iter = submissionDetails.iterator();
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java	17 Nov 2005 06:32:20 -0000	1.3
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitFilesSessionDAO.java	28 Nov 2005 22:51:32 -0000	1.4
@@ -36,6 +36,7 @@
 	 */
 	public void createSession(SubmitFilesSession submitSession) {
 		 this.getHibernateTemplate().save(submitSession);
+		 this.getHibernateTemplate().flush();
 	}
     
     public List getSubmitFilesSessionByContentID(Long contentID){
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v
diff -u -r1.30 -r1.31
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	18 Nov 2005 06:18:46 -0000	1.30
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	28 Nov 2005 22:51:32 -0000	1.31
@@ -118,8 +118,9 @@
 		SubmitFilesContent toContent = (SubmitFilesContent) fromContent.clone();
 		//reset some new attributes for toContent
 		toContent.setContentID(toContentId);
+		//clear ToolSession
 		toContent.setToolSession(new TreeSet());
-		
+
 		submitFilesContentDAO.insert(toContent);
 	}
     /**
@@ -345,7 +346,7 @@
             submitSession.setStatus(new Integer(SubmitFilesSession.INCOMPLETE));
             submitSession.setContent(submitContent);
             submitFilesSessionDAO.createSession(submitSession);
-            log.debug("Survey session created");
+            log.debug("Submit File session created");
         }
         catch (DataAccessException e)
         {