From f1fff77a2c3472d6a21c7d506ea4bf2198dfd989 Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 6 Aug 2009 11:15:44 +0000 Subject: [PATCH] Minor tweaks that will make a later proposal (will follow when I have done some more testing) easier. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@801601 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/TagLibraryInfoImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java index 05372f9ce..b3b7e92b5 100644 --- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java +++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java @@ -149,8 +149,8 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { } try { - if (!location[0].endsWith("jar")) { - // Location points to TLD file + if (location[1] == null) { + // Location points directly to TLD file try { in = getResourceAsStream(location[0]); if (in == null) { @@ -320,7 +320,7 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { String[] location = new String[2]; location[0] = uri; - if (location[0].endsWith("jar")) { + if (location[0].endsWith(".jar")) { URL url = null; try { url = ctxt.getResource(location[0]); -- 2.11.0