Index: lams_tool_sbmt/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/build.xml	15 Jul 2005 05:28:31 -0000	1.6
+++ lams_tool_sbmt/build.xml	15 Jul 2005 06:42:08 -0000	1.7
@@ -307,7 +307,7 @@
 			</sql>
 			<delete quiet="true" dir ="${contentrepository.location}"/>
 		</target>
-x
+
 	<!-- =================================================================== -->
 	<!-- Generate the deploy package                                         -->
 	<!-- =================================================================== -->
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	13 Jul 2005 06:27:57 -0000	1.2
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	15 Jul 2005 06:42:08 -0000	1.3
@@ -62,11 +62,12 @@
 		this.dateOfSubmission = details.getDateOfSubmission();
 		this.uuID = details.getUuid();
 		this.versionID = details.getVersionID();
-		
-		this.reportID = report.getReportID();
-		this.dateMarksReleased = report.getDateMarksReleased();		
-		this.comments = report.getComments();
-		this.marks = report.getMarks();
+		if(report != null){
+			this.reportID = report.getReportID();
+			this.dateMarksReleased = report.getDateMarksReleased();		
+			this.comments = report.getComments();
+			this.marks = report.getMarks();
+		}
 	}
 	public FileDetailsDTO(SubmissionDetails details){
 		
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.5 -r1.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	15 Jul 2005 05:27:26 -0000	1.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java	15 Jul 2005 06:42:08 -0000	1.6
@@ -379,8 +379,7 @@
 		else {
 			NodeKey nodeKey = uploadFileToRepository(stream, fileName, mimeType);
 			SubmissionDetails details = new SubmissionDetails(filePath,fileDescription,dateOfSubmission,
-															  nodeKey.getUuid(),nodeKey.getVersion(),
-															  userID);
+															  userID,nodeKey.getUuid(),nodeKey.getVersion());
 			//update session, then insert the detail too.
 			Set detailSet = session.getSubmissionDetails();
 			detailSet.add(details);