Author: tchemit Date: 2012-11-21 02:28:03 +0100 (Wed, 21 Nov 2012) New Revision: 3752 Url: http://chorem.org/repositories/revision/pollen/3752 Log: fixes #856: Updates to struts 2.3.7 (fix compil) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-11-21 01:18:28 UTC (rev 3751) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-11-21 01:28:03 UTC (rev 3752) @@ -136,7 +136,7 @@ String acceptedFileName = null; - if (acceptFile(action, files[0], fileName[0], contentType[0], inputName, validation, ac.getLocale())) { + if (acceptFile(action, files[0], fileName[0], contentType[0], inputName, validation)) { acceptedFile = files[0]; acceptedContentType = contentType[0]; @@ -187,14 +187,8 @@ private String getTextMessage(Object action, String messageKey, Object[] args, Locale locale) { if (args == null || args.length == 0) { - if (action != null && useActionMessageBundle) { - return LocalizedTextUtil.findText(action.getClass(), messageKey, locale); - } return LocalizedTextUtil.findText(this.getClass(), messageKey, locale); } else { - if (action != null && useActionMessageBundle) { - return LocalizedTextUtil.findText(action.getClass(), messageKey, locale, DEFAULT_MESSAGE, args); - } return LocalizedTextUtil.findText(this.getClass(), messageKey, locale, DEFAULT_MESSAGE, args); } }