Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java =================================================================== diff -u -r80371e446858031dcb9d7fa4456a79e8ab71693c -r3595dfceb8320f319846996220111561c2fc7b6e --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java (.../ImportGroupsController.java) (revision 80371e446858031dcb9d7fa4456a79e8ab71693c) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java (.../ImportGroupsController.java) (revision 3595dfceb8320f319846996220111561c2fc7b6e) @@ -52,20 +52,21 @@ importForm.setOrgId(0); File file = null; - File uploadDir = FileUtil.getTmpFileUploadDir(importForm.getTmpFileUploadId()); - if (uploadDir.canRead()) { - File[] files = uploadDir.listFiles(); - if (files.length > 1) { - throw new IOException("Uploaded more than 1 file"); - } else if (files.length == 1) { - file = files[0]; + if (importForm.getTmpFileUploadId() != null) { + File uploadDir = FileUtil.getTmpFileUploadDir(importForm.getTmpFileUploadId()); + if (uploadDir.canRead()) { + File[] files = uploadDir.listFiles(); + if (files.length > 1) { + throw new IOException("Uploaded more than 1 file"); + } else if (files.length == 1) { + file = files[0]; + } } } - - importForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); - + // validation if (file == null) { + importForm.setTmpFileUploadId(FileUtil.generateTmpFileUploadId()); return "import/importGroups"; }