Author: remy.maucherat(a)jboss.com Date: 2009-10-21 12:38:38 -0400 (Wed, 21 Oct 2009) New Revision: 1215 Modified: trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Log: - The old code used normalize underneath. Modified: trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java =================================================================== --- trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2009-10-21 15:59:16 UTC (rev 1214) +++ trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2009-10-21 16:38:38 UTC (rev 1215) @@ -68,6 +68,7 @@ import javax.servlet.jsp.tagext.VariableInfo; import org.apache.catalina.Globals; +import org.apache.catalina.util.RequestUtil; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; import org.jboss.logging.Logger; @@ -169,6 +170,9 @@ org.apache.catalina.deploy.jsp.TagLibraryInfo tagLibraryInfo = ((HashMap<String, org.apache.catalina.deploy.jsp.TagLibraryInfo>) ctxt.getServletContext().getAttribute(Globals.JSP_TAG_LIBRARIES)).get(uri); + if (tagLibraryInfo == null) { + err.jspError("jsp.error.file.not.found", uriIn); + } ArrayList<TagInfo> tagInfos = new ArrayList<TagInfo>(); ArrayList<TagFileInfo> tagFileInfos = new ArrayList<TagFileInfo>(); @@ -233,6 +237,9 @@ uri); } else if (uriType == NOROOT_REL_URI) { uri = ctxt.resolveRelativeUri(uri); + if (uri != null) { + uri = RequestUtil.normalize(uri); + } } String[] location = new String[2];