You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/05/05 00:39:17 UTC
git commit: [WICKET-5565] Added a check on request url to see if it
starts with mounted segments (for classes MountedMapper and PackageMapper)
Repository: wicket
Updated Branches:
refs/heads/master 406e54e1c -> e613e28b8
[WICKET-5565] Added a check on request url to see if it starts with
mounted segments (for classes MountedMapper and PackageMapper)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e613e28b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e613e28b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e613e28b
Branch: refs/heads/master
Commit: e613e28b860ab6d7b140c0d746ea3b7442dc1751
Parents: 406e54e
Author: bitstorm <an...@gmail.com>
Authored: Mon May 5 00:38:40 2014 +0200
Committer: bitstorm <an...@gmail.com>
Committed: Mon May 5 00:38:40 2014 +0200
----------------------------------------------------------------------
.../request/mapper/AbstractBookmarkableMapper.java | 12 ++++++++++++
.../wicket/core/request/mapper/MountedMapper.java | 15 +--------------
.../wicket/core/request/mapper/PackageMapper.java | 2 +-
3 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e613e28b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
index e38d956..3084e41 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java
@@ -784,4 +784,16 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
return mandatoryParametersSet;
}
+
+ protected boolean urlStartsWithMountedSegments(Url url)
+ {
+ if (url == null)
+ {
+ return false;
+ }
+ else
+ {
+ return getMatchedSegmentSizes(url) != null;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e613e28b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
index fdf1dc2..39def49 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java
@@ -133,7 +133,7 @@ public class MountedMapper extends AbstractBookmarkableMapper
return new UrlInfo(null, getContext().getHomePageClass(), newPageParameters());
}
// check if the URL starts with the proper segments
- else if (urlStartsWith(url, mountSegments))
+ else if (urlStartsWithMountedSegments(url))
{
// try to extract page and component information from URL
PageComponentInfo info = getPageComponentInfo(url);
@@ -148,19 +148,6 @@ public class MountedMapper extends AbstractBookmarkableMapper
}
}
- @Override
- protected boolean urlStartsWith(Url url, String... segments)
- {
- if (url == null)
- {
- return false;
- }
- else
- {
- return getMatchedSegmentSizes(url) != null;
- }
- }
-
protected PageParameters newPageParameters()
{
return new PageParameters();
http://git-wip-us.apache.org/repos/asf/wicket/blob/e613e28b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java
index ff8b81a..4f0f107 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java
@@ -133,7 +133,7 @@ public class PackageMapper extends AbstractBookmarkableMapper
protected UrlInfo parseRequest(Request request)
{
Url url = request.getUrl();
- if (url.getSegments().size() > mountSegments.length)
+ if (urlStartsWithMountedSegments(url))
{
// try to extract page and component information from URL
PageComponentInfo info = getPageComponentInfo(url);