From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 4 Aug 2010 11:03:30 +0000 (+0000)
Subject: Let's be more explicit in logging, what the actual
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dcde7f54ef436c4d08653232f140dde1f98d1800;p=tomcat7.0

Let's be more explicit in logging, what the actual
jar file is.


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@982210 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
index 05ec3051c..769bc258f 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -184,14 +184,14 @@ public class StandardJarScanner implements JarScanner {
                         // Extract the jarName if there is one to be found
                         String jarName = getJarName(urls[i]);
                         
-                        // Skip JARs with known not to be interesting and JARs
+                        // Skip JARs known not to be interesting and JARs
                         // in WEB-INF/lib we have already scanned
                         if (jarName != null &&
                             !(Matcher.matchPath(ignoredJarsTokens, jarName) ||
                                 urls[i].toString().contains(
                                         Constants.WEB_INF_LIB + jarName))) {
                             if (log.isDebugEnabled()) {
-                                log.debug(sm.getString("jarScan.classloaderJarScan", jarName));
+                                log.debug(sm.getString("jarScan.classloaderJarScan", urls[i]));
                             }
                             try {
                                 process(callback, urls[i]);
@@ -201,7 +201,7 @@ public class StandardJarScanner implements JarScanner {
                             }
                         } else {
                             if (log.isTraceEnabled()) {
-                                log.trace(sm.getString("jarScan.classloaderJarNoScan", jarName));
+                                log.trace(sm.getString("jarScan.classloaderJarNoScan", urls[i]));
                             }
                         }
                     }