Author: funkman Date: Wed Jan 3 11:29:52 2007 New Revision: 492263 URL: http://svn.apache.org/viewvc?view=rev&rev=492263 Log: http://issues.apache.org/bugzilla/show_bug.cgi?id=41267 NPE in TagLibraryInfoImpl for a declared tag files not in jar files
Patch by Fabrizio Giustina - fgiust at-apache:org Modified: tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java Modified: tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java?view=diff&rev=492263&r1=492262&r2=492263 ============================================================================== --- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java (original) +++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java Wed Jan 3 11:29:52 2007 @@ -492,7 +492,11 @@ if (path.startsWith("/META-INF/tags")) { // Tag file packaged in JAR - ctxt.getTagFileJarUrls().put(path, jarFileUrl); + // check if jarFileUrl is not null before adding it, or this will + // cause a NPE. + if (jarFileUrl != null) { + ctxt.getTagFileJarUrls().put(path, jarFileUrl); + } } else if (!path.startsWith("/WEB-INF/tags")) { err.jspError("jsp.error.tagfile.illegalPath", path); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]