Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java,v
diff -u -r1.6 -r1.7
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java	7 Feb 2007 00:20:04 -0000	1.6
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java	23 May 2007 06:30:48 -0000	1.7
@@ -49,6 +49,7 @@
  * 
  * @struts:action-forward name="importresult" path=".importresult"
  * @struts:action-forward name="sysadmin" path="/sysadminstart.do"
+ * @struts:action-forward name="import" path="/importexcel.do"
  */
 public class ImportExcelSaveAction extends Action {
 	
@@ -67,6 +68,11 @@
 		ImportExcelForm importExcelForm = (ImportExcelForm)form;
 		FormFile file = importExcelForm.getFile();
 		
+		// validation
+		if (file==null || file.getFileSize()<=0) {
+			return mapping.findForward("import");
+		}
+		
 		List results = importService.parseSpreadsheet(file);
 		String successMessageKey = (importService.isUserSpreadsheet(file) ? "msg.users.created" : "msg.users.added");
 		
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1SaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/Attic/ImportV1SaveAction.java,v
diff -u -r1.2 -r1.3
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1SaveAction.java	7 Feb 2007 00:20:04 -0000	1.2
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1SaveAction.java	23 May 2007 06:30:48 -0000	1.3
@@ -51,6 +51,7 @@
  * 
  * @struts:action-forward name="importv1contents" path="/importv1contents.do"
  * @struts:action-forward name="sysadmin" path="/sysadminstart.do"
+ * @struts:action-forward name="importv1" path="/importv1.do"
  */
 public class ImportV1SaveAction extends Action {
 	
@@ -72,6 +73,11 @@
 		FormFile file = importV1Form.getFile();
 		boolean includeIntegrated = importV1Form.getIntegrated();
 		
+		// validation
+		if (file==null || file.getFileSize()<=0) {
+			return mapping.findForward("importv1");
+		}
+		
 		List<List> results = importService.parseV1UsersFile(file, includeIntegrated);
 		List<V1UserDTO> users = results.get(0);
 		List<V1OrganisationDTO> orgs = results.get(1);