You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2012/03/01 12:19:07 UTC
git commit: WICKET-4435 merged from 1.5.x
Updated Branches:
refs/heads/master 78052bf6c -> 6c4c8805f
WICKET-4435 merged from 1.5.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6c4c8805
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6c4c8805
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6c4c8805
Branch: refs/heads/master
Commit: 6c4c8805f06434cae357ab7b3be78f2790db4cf4
Parents: 78052bf
Author: Sven Meier <sv...@apache.org>
Authored: Thu Mar 1 12:18:50 2012 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Thu Mar 1 12:18:50 2012 +0100
----------------------------------------------------------------------
.../apache/wicket/request/mapper/CryptoMapper.java | 10 ++++++++--
.../html/form/upload/UploadStatusResource.java | 6 ++++--
.../ajax/markup/html/form/upload/progressbar.js | 9 +++++----
3 files changed, 17 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6c4c8805/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java b/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
index a53ce24..f0e4c20 100755
--- a/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/mapper/CryptoMapper.java
@@ -186,8 +186,14 @@ public class CryptoMapper implements IRequestMapper
int segNo = 1;
for (; segNo < encryptedNumberOfSegments; segNo++)
{
- if (segNo > originalNumberOfSegments ||
- !generator.next().equals(encryptedSegments.get(segNo)))
+ if (segNo > originalNumberOfSegments)
+ {
+ break;
+ }
+
+ String next = generator.next();
+ String encryptedSegment = encryptedSegments.get(segNo);
+ if (!next.equals(encryptedSegment))
{
break;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6c4c8805/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
index f76bfcf..84ed600 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadStatusResource.java
@@ -26,6 +26,7 @@ import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequestImpl;
import org.apache.wicket.protocol.http.servlet.UploadInfo;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
+import org.apache.wicket.util.time.Duration;
/**
* A resource that prints out basic statistics about the current upload. This resource is used to
@@ -62,6 +63,7 @@ class UploadStatusResource extends AbstractResource
ResourceResponse response = new ResourceResponse();
response.setContentType("text/html; charset=" + encoding);
+ response.setCacheDuration(Duration.NONE);
final String status = getStatus(attributes);
response.setWriteCallback(new WriteCallback()
@@ -85,11 +87,11 @@ class UploadStatusResource extends AbstractResource
*/
private String getStatus(final Attributes attributes)
{
+ final String upload = attributes.getParameters().get(UPLOAD_PARAMETER).toString();
+
final HttpServletRequest req = (HttpServletRequest)attributes.getRequest()
.getContainerRequest();
- final String upload = req.getParameter(UPLOAD_PARAMETER);
-
UploadInfo info = MultipartServletWebRequestImpl.getUploadInfo(req, upload);
String status = null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/6c4c8805/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
index 62316bc..96c741b 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
@@ -65,7 +65,7 @@ Wicket.WUPB.prototype = {
if( oldLabel != null){
Wicket.$(this.statusid).removeChild(oldLabel);
}
- Wicket.$(this.statusid).appendChild(label);
+ Wicket.$(this.statusid).appendChild(label);
},
setPercent : function(progressPercent){
@@ -77,7 +77,7 @@ Wicket.WUPB.prototype = {
},
load : function() {
- var URL = this.url + '&anticache=' + Math.random();
+ var URL = this.url;
this.iframe = Wicket._createIFrame(""+Math.random());
@@ -88,11 +88,12 @@ Wicket.WUPB.prototype = {
},
update : function() {
+ var responseAsText;
if(this.iframe.contentDocument){
- var responseAsText = this.iframe.contentDocument.body.innerHTML;
+ responseAsText = this.iframe.contentDocument.body.innerHTML;
}else{
// for IE 5.5, 6 and 7:
- var responseAsText = this.iframe.contentWindow.document.body.innerHTML
+ responseAsText = this.iframe.contentWindow.document.body.innerHTML
}
var update = responseAsText.split('|');