Repository: wicket Updated Branches: refs/heads/master 7c601fcce -> 9e3e16709
WICKET-6481 code review feedbacks Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9e3e1670 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9e3e1670 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9e3e1670 Branch: refs/heads/master Commit: 9e3e16709b4652f091ae1c946b6f0618e040ce18 Parents: 7c601fc Author: Andrea Del Bene <[email protected]> Authored: Tue Oct 17 17:32:05 2017 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Tue Oct 17 17:32:05 2017 +0200 ---------------------------------------------------------------------- .../core/request/mapper/PageInstanceMapper.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9e3e1670/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java index 74b1368..52b81a7 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java @@ -171,8 +171,9 @@ public class PageInstanceMapper extends AbstractComponentMapper Url baseUrl = request.getClientUrl(); String namespace = getContext().getNamespace(); String pageIdentifier = getContext().getPageIdentifier(); + List<String> segments = url.getSegments(); - if (hasSegmentsAfterPageIdentifier(url, pageIdentifier)) + if (isNotPageInstanceUrl(segments, pageIdentifier)) { return false; } @@ -193,11 +194,17 @@ public class PageInstanceMapper extends AbstractComponentMapper return matches; } - private boolean hasSegmentsAfterPageIdentifier(Url url, String pageIdentifier) - { - List<String> segments = url.getSegments(); + + private boolean isNotPageInstanceUrl(List<String> segments, String pageIdentifier) + { + if (segments.size() > 2 ) + { + return true; + } + int pageIdIndex = segments.indexOf(pageIdentifier); + //check if we have segments after pageIdentifier return pageIdIndex < 0 || segments.size() - 1 > pageIdIndex; } }
