You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/01/17 08:53:16 UTC
svn commit: r1232327 -
/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/AbstractDispatcherTagHandler.java
Author: cziegeler
Date: Tue Jan 17 07:53:16 2012
New Revision: 1232327
URL: http://svn.apache.org/viewvc?rev=1232327&view=rev
Log:
SLING-2353 : Prevent <sling:include resource="<%= null %>" /> to include itself
Modified:
sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/AbstractDispatcherTagHandler.java
Modified: sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/AbstractDispatcherTagHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/AbstractDispatcherTagHandler.java?rev=1232327&r1=1232326&r2=1232327&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/AbstractDispatcherTagHandler.java (original)
+++ sling/trunk/bundles/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/AbstractDispatcherTagHandler.java Tue Jan 17 07:53:16 2012
@@ -114,11 +114,6 @@ public abstract class AbstractDispatcher
}
}
- // prevent useless recursion, we don't need to use equals here(!)
- if ( resource == request.getResource()
- && resourceType == null && replaceSelectors == null && addSelectors == null && replaceSuffix == null ) {
- throw new JspTagException("Resource is including itself without changing resource type, selectors, or suffix!");
- }
try {
// create a dispatcher for the resource or path
RequestDispatcher dispatcher;
@@ -156,7 +151,10 @@ public abstract class AbstractDispatcher
clear();
}
- public void setResource(Resource rsrc) {
+ public void setResource(final Resource rsrc) {
+ if ( rsrc == null ) {
+ throw new NullPointerException("Resource should not be null.");
+ }
this.resource = rsrc;
}