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
[2/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
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/614e3b50
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/614e3b50
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/614e3b50
Branch: refs/heads/master
Commit: 614e3b508346e55d2fb89d767f4bf6bda5ee4537
Parents: 0f8a81f
Author: Peter Ertl <pe...@apache.org>
Authored: Fri Feb 3 13:17:10 2012 +0100
Committer: Peter Ertl <pe...@apache.org>
Committed: Fri Feb 3 13:24:54 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/614e3b50/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 d66f32e..ad48cf1 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/614e3b50/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());
}
}