Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv3951
Modified Files:
Tag: MMBase-1_8
IncludeTag.java
Log Message:
MMB-1596
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
See also: http://www.mmbase.org/jira/browse/MMB-1596
Index: IncludeTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/IncludeTag.java,v
retrieving revision 1.66.2.6
retrieving revision 1.66.2.7
diff -u -b -r1.66.2.6 -r1.66.2.7
--- IncludeTag.java 18 Jan 2008 14:05:57 -0000 1.66.2.6
+++ IncludeTag.java 18 Feb 2008 18:30:04 -0000 1.66.2.7
@@ -35,7 +35,7 @@
*
* @author Michiel Meeuwissen
* @author Johannes Verelst
- * @version $Id: IncludeTag.java,v 1.66.2.6 2008/01/18 14:05:57 michiel Exp $
+ * @version $Id: IncludeTag.java,v 1.66.2.7 2008/02/18 18:30:04 michiel Exp $
*/
public class IncludeTag extends UrlTag {
@@ -296,13 +296,16 @@
// Orion bug fix.
//req.getParameterMap();
+ try {
+ ServletContext sc = pageContext.getServletContext();
+ if (sc == null) log.error("Cannot retrieve ServletContext from
PageContext");
+ if (!
ResourceLoader.getWebRoot().getResource(relativeUrl).openConnection().getDoInput())
{
+ handleResponse(404, "No such resource " + relativeUrl,
relativeUrl);
+ } else {
HttpServletRequestWrapper requestWrapper = new
HttpServletRequestWrapper(req);
if (log.isTraceEnabled()) {
log.trace("Attributes " +
Collections.list(req.getAttributeNames()) + " -> " +
Collections.list(requestWrapper.getAttributeNames()));
}
- try {
- ServletContext sc = pageContext.getServletContext();
- if (sc == null) log.error("Cannot retrieve ServletContext from
PageContext");
RequestDispatcher requestDispatcher =
sc.getRequestDispatcher(relativeUrl);
if (requestDispatcher == null) {
throw new NotFoundException("Page \"" + relativeUrl + "\" does
not exist (No request-dispatcher could be created)");
@@ -310,14 +313,14 @@
IncludeWrapper responseWrapper;
String encoding = encodingAttribute.getString(this);
- if (encoding.equals("")) {
+ if (encoding.length() == 0) {
responseWrapper = new IncludeWrapper(resp);
} else {
responseWrapper = new IncludeWrapper(resp, encoding);
}
requestDispatcher.include(requestWrapper, responseWrapper);
-
handleResponse(responseWrapper.getStatus(),
responseWrapper.toString(), relativeUrl);
+ }
} catch (Throwable e) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
