svn commit: r1205847 - in /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper: AbstractBookmarkableMapper.java MountedMapper.java

[mgrigorov]

Author: mgrigorov
Date: Thu Nov 24 14:36:33 2011
New Revision: 1205847

URL: http://svn.apache.org/viewvc?rev=1205847&view=rev
Log:
WICKET-4250 Checks in IRequestMapper.mapHandler should be on page instance, if 
available


Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java?rev=1205847&r1=1205846&r2=1205847&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java
 Thu Nov 24 14:36:33 2011
@@ -293,6 +293,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;
@@ -351,7 +356,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/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java?rev=1205847&r1=1205846&r2=1205847&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/MountedMapper.java
 Thu Nov 24 14:36:33 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();