Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 79F98200A01 for ; Tue, 3 May 2016 15:21:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7912A1609F4; Tue, 3 May 2016 15:21:26 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BFDA11609F3 for ; Tue, 3 May 2016 15:21:25 +0200 (CEST) Received: (qmail 81768 invoked by uid 500); 3 May 2016 13:21:24 -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 81758 invoked by uid 99); 3 May 2016 13:21:24 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 13:21:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 5D1461A4789 for ; Tue, 3 May 2016 13:21:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id TquDNTN2B0JA for ; Tue, 3 May 2016 13:21:23 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 9208D5F4EB for ; Tue, 3 May 2016 13:21:23 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 2BB51E0423 for ; Tue, 3 May 2016 13:21:22 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 371FC3A019B for ; Tue, 3 May 2016 13:21:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1742111 - /tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Date: Tue, 03 May 2016 13:21:21 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160503132122.371FC3A019B@svn01-us-west.apache.org> archived-at: Tue, 03 May 2016 13:21:26 -0000 Author: markt Date: Tue May 3 13:21:21 2016 New Revision: 1742111 URL: http://svn.apache.org/viewvc?rev=1742111&view=rev Log: Correct regression in r1742105. Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Modified: tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java?rev=1742111&r1=1742110&r2=1742111&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Tue May 3 13:21:21 2016 @@ -398,9 +398,8 @@ public class TldScanner { for (String path : paths) { if (path.endsWith(TLD_EXT)) { - String webappPath = WEB_INF + "classes/META-INF" + path; try { - parseTld(webappPath); + parseTld(path); } catch (SAXException e) { throw new IOException(e); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org