Author: violetagg
Date: Mon Jul 11 20:00:21 2016
New Revision: 1752212

URL: http://svn.apache.org/viewvc?rev=1752212&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59813
Ensure that circular relations of the Class-Path attribute from JAR manifests 
will be processed correctly.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1752212&r1=1752211&r2=1752212&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Mon 
Jul 11 20:00:21 2016
@@ -273,6 +273,7 @@ public class StandardJarScanner implemen
                                 
log.debug(sm.getString("jarScan.classloaderJarScan", url));
                             }
                             try {
+                                processedURLs.add(url);
                                 process(scanType, callback, url, null, 
isWebapp, classPathUrlsToProcess);
                             } catch (IOException ioe) {
                                 
log.warn(sm.getString("jarScan.classloaderFail", url), ioe);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1752212&r1=1752211&r2=1752212&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 11 20:00:21 2016
@@ -45,6 +45,14 @@
   issues do not "pop up" wrt. others).
 -->
 <section name="Tomcat 9.0.0.M10" rtext="in development">
+  <subsection name="Catalina">
+    <changelog>
+      <fix>
+        <bug>59813</bug>: Ensure that circular relations of the Class-Path
+        attribute from JAR manifests will be processed correctly. (violetagg)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Jasper">
     <changelog>
       <fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to