You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/01/08 14:15:44 UTC

git commit: WICKET-4954 Issue with file upload with progress bar via AJAX and Firefox

Updated Branches:
  refs/heads/master 25ab7d2df -> 1f1120aab


WICKET-4954 Issue with file upload with progress bar via AJAX and Firefox


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1f1120aa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1f1120aa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1f1120aa

Branch: refs/heads/master
Commit: 1f1120aabb16a3f2deaaec38db313f5dfa54593e
Parents: 25ab7d2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jan 8 15:15:14 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 8 15:15:14 2013 +0200

----------------------------------------------------------------------
 .../servlet/MultipartServletWebRequestImpl.java    |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/1f1120aa/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
index 055b31b..4e96e4b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java
@@ -168,9 +168,14 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest
 			totalBytes = request.getContentLength();
 
 			onUploadStarted(totalBytes);
-			items = fileUpload.parseRequest(ctx);
-			onUploadCompleted();
-
+			try
+			{
+				items = fileUpload.parseRequest(ctx);
+			}
+			finally
+			{
+				onUploadCompleted();
+			}
 		}
 		else
 		{