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 2012/03/01 11:11:42 UTC
[2/2] git commit: WICKET-4435 UploadProgressBar won't update while
uploading if CryptoMapper is used as RootRequestMapper
WICKET-4435 UploadProgressBar won't update while uploading if CryptoMapper is used as RootRequestMapper
Small restructure of the code to make it easier to debug.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/56db2402
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/56db2402
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/56db2402
Branch: refs/heads/wicket-1.5.x
Commit: 56db2402a2785df878fb1e5a21d6a2e4cd34a197
Parents: 887f260
Author: martin-g <mg...@apache.org>
Authored: Thu Mar 1 12:08:43 2012 +0200
Committer: martin-g <mg...@apache.org>
Committed: Thu Mar 1 12:08:43 2012 +0200
----------------------------------------------------------------------
.../apache/wicket/request/mapper/CryptoMapper.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/56db2402/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 fe595f8..8c5a2b9 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
@@ -183,8 +183,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;
}