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 17:34:23 UTC
[2/2] git commit: WICKET-4384 improve wicket's handling of empty /
null page parameters:
WICKET-4384 improve wicket's handling of empty / null page parameters:
- DefaultPageFactory#newPage() should be sure to not pass 'null' to a page constructor with page parameters
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cd254a85
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cd254a85
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cd254a85
Branch: refs/heads/wicket-1.5.x
Commit: cd254a8506b9bf8e00981d09f5dd87b530daf026
Parents: 66cce74
Author: Peter Ertl <pe...@apache.org>
Authored: Fri Feb 3 17:33:53 2012 +0100
Committer: Peter Ertl <pe...@apache.org>
Committed: Fri Feb 3 17:33:53 2012 +0100
----------------------------------------------------------------------
.../apache/wicket/session/DefaultPageFactory.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cd254a85/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java b/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
index 3a8be01..5795bfb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/session/DefaultPageFactory.java
@@ -93,8 +93,10 @@ public final class DefaultPageFactory implements IPageFactory
// If we got a PageParameters constructor
if (constructor != null)
{
+ final PageParameters nullSafeParams = parameters == null ? new PageParameters() : parameters;
+
// return new Page(parameters)
- return processPage(newPage(constructor, parameters), parameters);
+ return processPage(newPage(constructor, nullSafeParams), nullSafeParams);
}
// Always try default constructor if one exists