Author: fmeschbe
Date: Mon Aug 25 02:18:11 2008
New Revision: 688677
URL: http://svn.apache.org/viewvc?rev=688677&view=rev
Log:
SLING-613 Rethrow exceptions while including a resource as JspTagException
Modified:
incubator/sling/trunk/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/IncludeTagHandler.java
Modified:
incubator/sling/trunk/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/IncludeTagHandler.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/IncludeTagHandler.java?rev=688677&r1=688676&r2=688677&view=diff
==============================================================================
---
incubator/sling/trunk/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/IncludeTagHandler.java
(original)
+++
incubator/sling/trunk/scripting/jsp-taglib/src/main/java/org/apache/sling/scripting/jsp/taglib/IncludeTagHandler.java
Mon Aug 25 02:18:11 2008
@@ -21,6 +21,7 @@
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspTagException;
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.BodyContent;
import javax.servlet.jsp.tagext.TagSupport;
@@ -136,12 +137,11 @@
} else {
TagUtil.log(log, pageContext, "No content to include...",
null);
}
-
+
} catch (IOException ioe) {
- throw new JspException("Error including " + path, ioe);
+ throw new JspTagException(ioe);
} catch (ServletException ce) {
- throw new JspException("Error including " + path,
- TagUtil.getRootCause(ce));
+ throw new JspTagException(TagUtil.getRootCause(ce));
}
return EVAL_PAGE;