Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1F83F107B7 for ; Fri, 6 Mar 2015 20:40:48 +0000 (UTC) Received: (qmail 53788 invoked by uid 500); 6 Mar 2015 20:40:48 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 53747 invoked by uid 500); 6 Mar 2015 20:40:47 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 53735 invoked by uid 99); 6 Mar 2015 20:40:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Mar 2015 20:40:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8AA2E07F3; Fri, 6 Mar 2015 20:40:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: struts git commit: WW-4468 Switched to buildError on file limit excided Date: Fri, 6 Mar 2015 20:40:47 +0000 (UTC) Repository: struts Updated Branches: refs/heads/develop a1d277fac -> 5665dd52b WW-4468 Switched to buildError on file limit excided Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5665dd52 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5665dd52 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5665dd52 Branch: refs/heads/develop Commit: 5665dd52b5a6b430d74d6c9f1ca7b85ee2709007 Parents: a1d277f Author: Lukasz Lenart Authored: Fri Mar 6 21:40:10 2015 +0100 Committer: Lukasz Lenart Committed: Fri Mar 6 21:40:10 2015 +0100 ---------------------------------------------------------------------- .../dispatcher/multipart/JakartaStreamMultiPartRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/5665dd52/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java index eae0039..6fbd2c3 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java @@ -357,7 +357,7 @@ public class JakartaStreamMultiPartRequest implements MultiPartRequest { private void addFileSkippedError(String fileName, HttpServletRequest request) { String exceptionMessage = "Skipped file " + fileName + "; request size limit exceeded."; FileSizeLimitExceededException exception = new FileUploadBase.FileSizeLimitExceededException(exceptionMessage, getRequestSize(request), maxSize); - String message = buildMessage(exception, new Object[]{fileName, getRequestSize(request), maxSize}); + String message = buildErrorMessage(exception, new Object[]{fileName, getRequestSize(request), maxSize}); if (!errors.contains(message)) errors.add(message); }