Updated Branches:
  refs/heads/wicket-1.5.x 9c0a49c2d -> c81bddbcf

WICKET-4780 Using both MountedMapper and CryptoMapper causes warning

Delegate #getCompatibilityScore() to the wrapped ex-root request mapper


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

Branch: refs/heads/wicket-1.5.x
Commit: c81bddbcf6f942e618c3b3092a7188e0ac6812bf
Parents: 9c0a49c
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Tue Sep 25 10:33:25 2012 +0300
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Tue Sep 25 10:34:47 2012 +0300

----------------------------------------------------------------------
 .../apache/wicket/request/mapper/CryptoMapper.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/c81bddbc/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 8c5a2b9..28e2258 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
@@ -83,7 +83,7 @@ public class CryptoMapper implements IRequestMapper
 
        public int getCompatibilityScore(final Request request)
        {
-               return 0;
+               return wrappedMapper.getCompatibilityScore(request);
        }
 
        public Url mapHandler(final IRequestHandler requestHandler)
@@ -104,7 +104,7 @@ public class CryptoMapper implements IRequestMapper
 
                if (url == null)
                {
-                       return null;
+                       return wrappedMapper.mapRequest(request);
                }
 
                return wrappedMapper.mapRequest(request.cloneWithUrl(url));

Reply via email to