svn commit: r1495046 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/scan/StandardJarScanner.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Thu Jun 20 15:10:22 2013
New Revision: 1495046

URL: http://svn.apache.org/r1495046
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54745
Fix JarScanning when Tomcat is started via Java WebStart.
Patch provided by Nick Williams.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1495043

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1495046&r1=1495045&r2=1495046&view=diff
==============================================================================
--- 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java 
Thu Jun 20 15:10:22 2013
@@ -252,7 +252,8 @@ public class StandardJarScanner implemen
             callback.scan((JarURLConnection) conn);
         } else {
             String urlStr = url.toString();
-            if (urlStr.startsWith("file:") || urlStr.startsWith("jndi:")) {
+            if (urlStr.startsWith("file:") || urlStr.startsWith("jndi:") ||
+                    urlStr.startsWith("http:") || urlStr.startsWith("https:")) 
{
                 if (urlStr.endsWith(Constants.JAR_EXT)) {
                     URL jarURL = new URL("jar:" + urlStr + "!/");
                     callback.scan((JarURLConnection) jarURL.openConnection());

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1495046&r1=1495045&r2=1495046&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Jun 20 15:10:22 2013
@@ -70,6 +70,10 @@
         methods that does not include GET. (markt)
       </fix>
       <fix>
+        <bug>54745</bug>: Fix JAR file scanning when Tomcat is deployed via 
Java
+        Web Start. Patch provided by Nick Williams. (markt)
+      </fix>
+      <fix>
         <bug>55073</bug>, <bug>55108</bug>, <bug>55109</bug> &amp;
         <bug>55110</bug>: Small performance improvements. Patches provided by
         Adrian Nistor. (markt)



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