Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r25512cc063d6cbd4687e9f3235494724190bf763 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportExcelSaveController.java (.../ImportExcelSaveController.java) (revision 25512cc063d6cbd4687e9f3235494724190bf763) @@ -64,15 +64,15 @@ String sessionId = SessionManager.getSession().getId(); SessionManager.getSession().setAttribute(IImportService.IMPORT_FILE, file); // use a new thread only if number of users is > threshold -// if (importService.getNumRows(file) < IImportService.THRESHOLD) { -// List results = importService.parseSpreadsheet(file, sessionId); -// SessionManager.getSession(sessionId).setAttribute(IImportService.IMPORT_RESULTS, results); -// return "forward:/importuserresult.do"; -// } else { + if (importService.getNumRows(file) < IImportService.THRESHOLD) { + List results = importService.parseSpreadsheet(file, sessionId); + SessionManager.getSession(sessionId).setAttribute(IImportService.IMPORT_RESULTS, results); + return "forward:/importuserresult.do"; + } else { Thread t = new Thread(new ImportExcelThread(sessionId)); t.start(); return "import/status"; -// } + } } private class ImportExcelThread implements Runnable {