Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportUserResultAction.java =================================================================== diff -u -r96393fcda711611ec39dbc961ab6431b1f16bb4e -rbc455765c7c230d438318b1f62994420fe45db44 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportUserResultAction.java (.../ImportUserResultAction.java) (revision 96393fcda711611ec39dbc961ab6431b1f16bb4e) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportUserResultAction.java (.../ImportUserResultAction.java) (revision bc455765c7c230d438318b1f62994420fe45db44) @@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -48,6 +49,8 @@ */ public class ImportUserResultAction extends Action { + private static Logger log = Logger.getLogger(ImportUserResultAction.class); + public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, @@ -58,8 +61,13 @@ HttpSession ss = SessionManager.getSession(); List results = (List)ss.getAttribute(IImportService.IMPORT_RESULTS); - FormFile file = (FormFile)ss.getAttribute(IImportService.IMPORT_FILE); - String successMessageKey = (importService.isUserSpreadsheet(file) ? "msg.users.created" : "msg.users.added"); + String successMessageKey = ""; + try { + FormFile file = (FormFile)ss.getAttribute(IImportService.IMPORT_FILE); + successMessageKey = (importService.isUserSpreadsheet(file) ? "msg.users.created" : "msg.users.added"); + } catch (Exception e) { + log.error("Couldn't check spreadsheet type!", e); + } int successful = 0; for(int i=0; i