Updated Branches:
  refs/heads/master 99f5ea72a -> 72c2b2261

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/72c2b226
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/72c2b226
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/72c2b226

Branch: refs/heads/master
Commit: 72c2b2261a655498c9ac899cc1145ebc6247c441
Parents: 99f5ea7
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:33:25 2012 +0300

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


http://git-wip-us.apache.org/repos/asf/wicket/blob/72c2b226/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 40b0efa..03abefa 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
@@ -84,7 +84,7 @@ public class CryptoMapper implements IRequestMapper
        @Override
        public int getCompatibilityScore(final Request request)
        {
-               return 0;
+               return wrappedMapper.getCompatibilityScore(request);
        }
 
        @Override
@@ -107,7 +107,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