You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@wicket.apache.org by pe...@apache.org on 2011/12/01 11:52:25 UTC

svn commit: r1209030 - /wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java

Author: pete
Date: Thu Dec  1 10:52:25 2011
New Revision: 1209030

URL: http://svn.apache.org/viewvc?rev=1209030&view=rev
Log:
WICKET-4270 Remove superfluous call to ResourceReference#getResource() in ResourceMapper when trying to map the resource URL

Modified:
    wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java

Modified: wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java?rev=1209030&r1=1209029&r2=1209030&view=diff
==============================================================================
--- wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java (original)
+++ wicket/branches/wicket-1.5.x/wicket-core/src/main/java/org/apache/wicket/request/mapper/ResourceMapper.java Thu Dec  1 10:52:25 2011
@@ -163,9 +163,8 @@ public class ResourceMapper extends Abst
 
 		ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
 
-		// see if request handler addresses the resource we serve
-		if (resourceReference.equals(handler.getResourceReference()) == false &&
-			resourceReference.getResource().equals(handler.getResource()) == false)
+		// see if request handler addresses the resource reference we serve
+		if (resourceReference.equals(handler.getResourceReference()) == false)
 		{
 			return null;
 		}