You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/04/16 08:34:29 UTC

svn commit: r529143 - /incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java

Author: ehillenius
Date: Sun Apr 15 23:34:28 2007
New Revision: 529143

URL: http://svn.apache.org/viewvc?view=rev&rev=529143
Log:
removed wrong check

Modified:
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java?view=diff&rev=529143&r1=529142&r2=529143
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebRequestCycleProcessor.java Sun Apr 15 23:34:28 2007
@@ -26,7 +26,6 @@
 import org.apache.wicket.IPageMap;
 import org.apache.wicket.IRequestTarget;
 import org.apache.wicket.Page;
-import org.apache.wicket.PageParameters;
 import org.apache.wicket.RequestCycle;
 import org.apache.wicket.Session;
 import org.apache.wicket.AccessStackPageMap.Access;
@@ -35,7 +34,6 @@
 import org.apache.wicket.request.AbstractRequestCycleProcessor;
 import org.apache.wicket.request.IRequestCodingStrategy;
 import org.apache.wicket.request.RequestParameters;
-import org.apache.wicket.request.target.component.BookmarkableListenerInterfaceRequestTarget;
 import org.apache.wicket.request.target.component.IBookmarkablePageRequestTarget;
 import org.apache.wicket.util.string.Strings;
 
@@ -74,28 +72,14 @@
 			if (mounted instanceof IBookmarkablePageRequestTarget)
 			{
 				IBookmarkablePageRequestTarget bookmarkableTarget = (IBookmarkablePageRequestTarget)mounted;
-				// the path was mounted, so return that directly
 				if (requestParameters.getComponentPath() != null
 						&& requestParameters.getInterfaceName() != null)
 				{
 					final String componentPath = requestParameters.getComponentPath();
 					final Page page = Session.get().getPage(requestParameters.getPageMapName(),
 							componentPath, requestParameters.getVersionNumber());
-
-					if (page != null && page.getClass() == bookmarkableTarget.getPageClass())
-					{
-						return resolveListenerInterfaceTarget(requestCycle, page, componentPath,
-								requestParameters.getInterfaceName(), requestParameters);
-					}
-					else
-					{
-						PageParameters params = new PageParameters(requestParameters
-								.getParameters());
-						return new BookmarkableListenerInterfaceRequestTarget(requestParameters
-								.getPageMapName(), bookmarkableTarget.getPageClass(), params,
-								requestParameters.getComponentPath(), requestParameters
-										.getInterfaceName());
-					}
+					return resolveListenerInterfaceTarget(requestCycle, page, componentPath,
+							requestParameters.getInterfaceName(), requestParameters);
 				}
 			}