Author: markt
Date: Thu Aug 6 11:15:44 2009
New Revision: 801601
URL: http://svn.apache.org/viewvc?rev=801601&view=rev
Log:
Minor tweaks that will make a later proposal (will follow when I have done some
more testing) easier.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=801601&r1=801600&r2=801601&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Thu
Aug 6 11:15:44 2009
@@ -149,8 +149,8 @@
}
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 @@
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]);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
