[JENKINS-24399] Refine URL criteria to identify class dirs.

jenkinsci · Apr 8, 2016 · 3c38ff1 · 3c38ff1
1 parent ab0a6e1
commit 3c38ff1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/ClasspathEntry.java b/src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/ClasspathEntry.java
@@ -96,7 +96,8 @@ static boolean isClassDirectoryURL(@Nonnull URL url) {
             // If the URL is a file but does not exist we fallback to default behaviour
             // as non existence will be dealt with when trying to use it.
         }
-        return url.toExternalForm().endsWith("/");
+        String u = url.toExternalForm();
+        return u.endsWith("/") && !u.startsWith("jar:");
     }
 
     /**

diff --git a/src/test/java/org/jenkinsci/plugins/scriptsecurity/scripts/ClasspathEntryTest.java b/src/test/java/org/jenkinsci/plugins/scriptsecurity/scripts/ClasspathEntryTest.java
@@ -44,7 +44,7 @@ public class ClasspathEntryTest {
         } else {
             assertRoundTrip("C:\\tmp\\x.jar", "file:/C:/tmp/x.jar");
         }
-        assertEquals("jar:file:/tmp/x.jar!/subjar.jar", "jar:file:/tmp/x.jar!/subjar.jar");
+        assertRoundTrip("jar:file:/tmp/x.jar!/subjar.jar", "jar:file:/tmp/x.jar!/subjar.jar");
     }
 
     private static void assertRoundTrip(String path, String url) throws Exception {