Author: almaw
Date: Wed May 23 04:40:01 2007
New Revision: 540932
URL: http://svn.apache.org/viewvc?view=rev&rev=540932
Log:
Remove 404 coding around a problem that doesn't exist and is handled elsewhere.
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java?view=diff&rev=540932&r1=540931&r2=540932
==============================================================================
---
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
(original)
+++
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/coding/PackageRequestTargetUrlCodingStrategy.java
Wed May 23 04:40:01 2007
@@ -92,31 +92,17 @@
log.debug("remainder=" + remainder);
log.debug("parametersFragment=" + parametersFragment);
final String bookmarkablePageClassName = packageName + "." +
remainder.substring(0, ix);
- try
- {
- Class bookmarkablePageClass =
Session.get().getClassResolver().resolveClass(
- bookmarkablePageClassName);
- PageParameters parameters = new
PageParameters(decodeParameters(parametersFragment,
- requestParameters.getParameters()));
-
- final String pageMapName =
(String)parameters.remove(WebRequestCodingStrategy.PAGEMAP);
- requestParameters.setPageMapName(pageMapName);
-
- BookmarkablePageRequestTarget target = new
BookmarkablePageRequestTarget(pageMapName,
- bookmarkablePageClass, parameters);
- return target;
- }
- catch (RuntimeException ex)
- {
- // If the class resolver wraps a ClassNotFoundException
with a
- // RuntimeException, just return null here, which will
cause a 404
- // or similar.
- if (ex.getCause() != null && ex.getCause() instanceof
ClassNotFoundException)
- {
- return null;
- }
- throw ex;
- }
+ Class bookmarkablePageClass =
Session.get().getClassResolver().resolveClass(
+ bookmarkablePageClassName);
+ PageParameters parameters = new
PageParameters(decodeParameters(parametersFragment,
+ requestParameters.getParameters()));
+
+ final String pageMapName =
(String)parameters.remove(WebRequestCodingStrategy.PAGEMAP);
+ requestParameters.setPageMapName(pageMapName);
+
+ BookmarkablePageRequestTarget target = new
BookmarkablePageRequestTarget(pageMapName,
+ bookmarkablePageClass, parameters);
+ return target;
}
/**
