Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -ra5e6187cc54ef82dae07a6e6ae0b2bc353554b03 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java (.../ImportToolContentAction.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java (.../ImportToolContentAction.java) (revision a5e6187cc54ef82dae07a6e6ae0b2bc353554b03) @@ -105,6 +105,7 @@ */ private void importLD(HttpServletRequest request) { List ldErrorMsgs = new ArrayList(); + List toolsErrorMsgs = new ArrayList(); Long ldId = null; try { @@ -152,7 +153,6 @@ } else { // if it is a .las file then it must be a 1.0.x file. Otherwise assume it is a 2.0 formatting zip file. - List toolsErrorMsgs = new ArrayList(); String extension = filename != null && filename.length() >= 4 ? filename.substring(filename.length()-4) : ""; if ( extension.equalsIgnoreCase(".las") ) { @@ -172,9 +172,6 @@ ldErrorMsgs.add(msg != null ? msg : "Uploaded file not an expected type."); } - if ( toolsErrorMsgs.size() > 0 ) { - request.setAttribute(ATTR_TOOLS_ERROR_MESSAGE,toolsErrorMsgs); - } } } catch (Exception e) { @@ -191,7 +188,11 @@ if ( ldErrorMsgs.size() > 0 ) { request.setAttribute(ATTR_LD_ERROR_MESSAGE,ldErrorMsgs); } + if ( toolsErrorMsgs.size() > 0 ) { + request.setAttribute(ATTR_TOOLS_ERROR_MESSAGE,toolsErrorMsgs); + } + } //***************************************************************************************