Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r7922cb321641adb3b2357e46e800b4ac21b36f14
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java	(.../DacoServiceImpl.java)	(revision 7922cb321641adb3b2357e46e800b4ac21b36f14)
@@ -100,7 +100,7 @@
     private MessageService messageService;
 
     private ILamsToolService toolService;
-    
+
     private IUserManagementService userManagementService;
 
     private IExportToolContentService exportContentService;
@@ -319,7 +319,7 @@
     public void uploadDacoAnswerFile(DacoAnswer answer, MultipartFile file) throws UploadDacoFileException {
 	try {
 	    InputStream is = file.getInputStream();
-	    String fileName = file.getName();
+	    String fileName = file.getOriginalFilename();
 	    String fileType = file.getContentType();
 	    // For file only upload one sigle file
 	    if ((answer.getQuestion().getType() == DacoConstants.QUESTION_TYPE_FILE)
@@ -716,8 +716,8 @@
      */
     private NodeKey processFile(MultipartFile file) throws UploadDacoFileException {
 	NodeKey node = null;
-	if ((file != null) && !StringUtils.isEmpty(file.getName())) {
-	    String fileName = file.getName();
+	String fileName = file.getOriginalFilename();
+	if ((file != null) && !StringUtils.isEmpty(fileName)) {
 	    try {
 		node = dacoToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType());
 	    } catch (InvalidParameterException e) {
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java
===================================================================
diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -r7922cb321641adb3b2357e46e800b4ac21b36f14
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java	(.../LearningController.java)	(revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java	(.../LearningController.java)	(revision 7922cb321641adb3b2357e46e800b4ac21b36f14)
@@ -799,7 +799,7 @@
 				    new Object[] { questionNumber }));
 			}
 		    } else {
-			String fileName = file.getName();
+			String fileName = file.getOriginalFilename();
 			boolean isImage = false;
 			if (fileName.length() > 5) {
 
Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/form/RecordForm.java
===================================================================
diff -u -r23b73e96556d74828d16d651138657e2c4a0e635 -r7922cb321641adb3b2357e46e800b4ac21b36f14
--- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/form/RecordForm.java	(.../RecordForm.java)	(revision 23b73e96556d74828d16d651138657e2c4a0e635)
+++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/form/RecordForm.java	(.../RecordForm.java)	(revision 7922cb321641adb3b2357e46e800b4ac21b36f14)
@@ -83,6 +83,14 @@
 	return file.get(number);
     }
 
+    public List<MultipartFile> getFile() {
+	return file;
+    }
+
+    public void setFile(List<MultipartFile> file) {
+	this.file = file;
+    }
+
     public void reset(HttpServletRequest request) {
 	answer = null;
 	file = null;
@@ -108,6 +116,7 @@
     public int getFileCount() {
 	return file.size();
     }
+
     public List<String> getAnswer() {
 	return answer;
     }