Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 13411 invoked from network); 3 Jan 2007 19:30:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jan 2007 19:30:53 -0000 Received: (qmail 29022 invoked by uid 500); 3 Jan 2007 19:30:57 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 28982 invoked by uid 500); 3 Jan 2007 19:30:57 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 28948 invoked by uid 500); 3 Jan 2007 19:30:57 -0000 Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org Received: (qmail 28944 invoked by uid 99); 3 Jan 2007 19:30:57 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jan 2007 11:30:57 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jan 2007 11:30:49 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 6DDDB1A981A; Wed, 3 Jan 2007 11:29:53 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r492263 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java Date: Wed, 03 Jan 2007 19:29:53 -0000 To: tomcat-dev@jakarta.apache.org From: funkman@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070103192953.6DDDB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org