Author: markt
Date: Mon Aug 12 16:15:14 2013
New Revision: 1513187
URL: http://svn.apache.org/r1513187
Log:
Fix the logic for the "Scanned one or more JARs for TLDs without finding a TLD"
warning.
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=1513187&r1=1513186&r2=1513187&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/TldScanner.java Mon Aug 12
16:15:14 2013
@@ -206,7 +206,7 @@ public class TldScanner {
JarScanner scanner = JarScannerFactory.getJarScanner(context);
TldScannerCallback callback = new TldScannerCallback();
scanner.scan(JarScanType.TLD, context, callback);
- if (!callback.tldFound) {
+ if (callback.scanFoundNoTLDs()) {
log.info(Localizer.getMessage("jsp.tldCache.noTldSummary"));
}
}
@@ -233,9 +233,13 @@ public class TldScanner {
private class TldScannerCallback implements JarScannerCallback {
private boolean tldFound = false;
+ private boolean jarFound = false;
@Override
public void scan(JarURLConnection urlConn, boolean isWebapp) throws
IOException {
+ if (!jarFound) {
+ jarFound = true;
+ }
boolean found = false;
Jar jar = JarFactory.newInstance(urlConn.getURL());
URL jarURL = urlConn.getJarFileURL();
@@ -272,6 +276,9 @@ public class TldScanner {
@Override
public void scan(File file, boolean isWebapp) throws IOException {
+ if (!jarFound) {
+ jarFound = true;
+ }
File metaInf = new File(file, "META-INF");
if (!metaInf.isDirectory()) {
return;
@@ -302,5 +309,10 @@ public class TldScanner {
public void scanWebInfClasses() throws IOException {
// this is now handled when WEB-INF is scanned for resources
}
+
+
+ private boolean scanFoundNoTLDs() {
+ return jarFound && !tldFound;
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
