Repository: wicket Updated Branches: refs/heads/wicket-6.x 9377f6c26 -> 03d94aae2
WICKET-5843 CryptoMapper doesn't work with context relative UrlResourceReferences Return the original Url if there was no encryption. (cherry picked from commit 55f164e4bc20ef4d54aaafbfbc79ffeb58f37caa) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/03d94aae Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/03d94aae Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/03d94aae Branch: refs/heads/wicket-6.x Commit: 03d94aae2d56d6d15787e470f39372256b122e56 Parents: 9377f6c Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Mar 27 23:15:28 2015 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Mar 27 23:16:16 2015 +0200 ---------------------------------------------------------------------- .../apache/wicket/core/request/mapper/CryptoMapper.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/03d94aae/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java index 0cc2d68..4d6a89f 100755 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/CryptoMapper.java @@ -343,6 +343,7 @@ public class CryptoMapper implements IRequestMapperDelegate protected Url encryptRequestListenerParameter(final Url url) { Url encryptedUrl = new Url(url); + boolean encrypted = false; for (Iterator<Url.QueryParameter> it = encryptedUrl.getQueryParameters().iterator(); it.hasNext();) { @@ -355,11 +356,19 @@ public class CryptoMapper implements IRequestMapperDelegate Url.QueryParameter encryptedParameter = new Url.QueryParameter(ENCRYPTED_PAGE_COMPONENT_INFO_PARAMETER, encryptedParameterValue); encryptedUrl.getQueryParameters().add(0, encryptedParameter); + encrypted = true; break; } } - return encryptedUrl; + if (encrypted) + { + return encryptedUrl; + } + else + { + return url; + } } /**
