You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/11/24 15:34:59 UTC
svn commit: r1205846 - in
/wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper:
AbstractBookmarkableMapper.java MountedMapper.java
Author: mgrigorov
Date: Thu Nov 24 14:34:58 2011
New Revision: 1205846
URL: http://svn.apache.org/viewvc?rev=1205846&view=rev
Log:
WICKET-4250 Checks in IRequestMapper.mapHandler should be on page instance, if available
Modified:
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
Modified: wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=1205846&r1=1205845&r2=1205846&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java (original)
+++ wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java Thu Nov 24 14:34:58 2011
@@ -291,6 +291,11 @@ public abstract class AbstractBookmarkab
return null;
}
+ protected boolean checkPageInstance(IRequestablePage page)
+ {
+ return page != null && checkPageClass(page.getClass());
+ }
+
protected boolean checkPageClass(Class<? extends IRequestablePage> pageClass)
{
return true;
@@ -348,7 +353,8 @@ public abstract class AbstractBookmarkab
IRequestablePage page = handler.getPage();
- if (!pageMustHaveBeenCreatedBookmarkable() || page.wasCreatedBookmarkable())
+ if (checkPageInstance(page) &&
+ (!pageMustHaveBeenCreatedBookmarkable() || page.wasCreatedBookmarkable()))
{
PageInfo info = null;
if (!page.isPageStateless())
Modified: wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java?rev=1205846&r1=1205845&r2=1205846&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java (original)
+++ wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java Thu Nov 24 14:34:58 2011
@@ -368,8 +368,7 @@ public class MountedMapper extends Abstr
{
ListenerInterfaceRequestHandler handler = (ListenerInterfaceRequestHandler)requestHandler;
IRequestablePage page = handler.getPage();
- Class<? extends IRequestablePage> pageClass = page.getClass();
- if (checkPageClass(pageClass))
+ if (checkPageInstance(page))
{
String componentPath = handler.getComponentPath();
RequestListenerInterface listenerInterface = handler.getListenerInterface();