You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2012/02/03 13:30:23 UTC
[1/2] git commit: WICKET-4384 cleaning up PageParameters in
AbstractBookmarkableMapper returns an empty instance if no parameters are
left after sanitizing instead of 'null' which by wicket definition indicates
that we have no page parameters
Updated Branches:
refs/heads/master 0f8a81fb9 -> 614e3b508
refs/heads/wicket-1.5.x b0f1f0ac7 -> 66cce7418
WICKET-4384 cleaning up PageParameters in AbstractBookmarkableMapper returns an empty instance if no parameters are left after sanitizing instead of 'null' which by wicket definition indicates that we have no page parameters
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/66cce741
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/66cce741
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/66cce741
Branch: refs/heads/wicket-1.5.x
Commit: 66cce7418fb16a72f246a7e119a9239e26c11ddd
Parents: b0f1f0a
Author: Peter Ertl <pe...@apache.org>
Authored: Fri Feb 3 13:26:06 2012 +0100
Committer: Peter Ertl <pe...@apache.org>
Committed: Fri Feb 3 13:26:06 2012 +0100
----------------------------------------------------------------------
.../request/mapper/AbstractBookmarkableMapper.java | 5 +++++
.../apache/wicket/request/mapper/UrlInfoTest.java | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/66cce741/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
index 6670191..8637cba 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
@@ -98,6 +98,11 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper
cleanParameters.remove(WebRequest.PARAM_AJAX);
cleanParameters.remove(WebRequest.PARAM_AJAX_BASE_URL);
cleanParameters.remove(WebRequest.PARAM_AJAX_REQUEST_ANTI_CACHE);
+
+ if (cleanParameters.isEmpty())
+ {
+ cleanParameters = null;
+ }
}
return cleanParameters;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/66cce741/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
index 47926d3..d5a507d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/UrlInfoTest.java
@@ -41,6 +41,6 @@ public class UrlInfoTest extends Assert
parameters.add(WebRequest.PARAM_AJAX_REQUEST_ANTI_CACHE, "12345.6879");
AbstractBookmarkableMapper.UrlInfo info = new UrlInfo(null, MockPage.class, parameters);
- assertTrue(info.getPageParameters().isEmpty());
+ assertNull(info.getPageParameters());
}
}