Author: mgrigorov
Date: Mon Aug 16 19:05:18 2010
New Revision: 986098
URL: http://svn.apache.org/viewvc?rev=986098&view=rev
Log:
WICKET-2993 ClassCastException when requesting for non-page class
Make the check for pageClass safer and check for IRequestablePage instead of
Page
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java?rev=986098&r1=986097&r2=986098&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/request/mapper/BookmarkableMapper.java
Mon Aug 16 19:05:18 2010
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.request.mapper;
-import org.apache.wicket.Page;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestablePage;
@@ -103,7 +102,7 @@ public class BookmarkableMapper extends
String className = url.getSegments().get(2);
Class<? extends IRequestablePage> pageClass =
getPageClass(className);
- if (Page.class.isAssignableFrom(pageClass))
+ if (pageClass != null &&
IRequestablePage.class.isAssignableFrom(pageClass))
{
// extract the PageParameters from URL if there
are any
