Merge pull request #3464 from oleg-nenashev/bug/JENKINS-51608

[JENKINS-51608] - Improve diagnostics of errorneous cases in ClassicPluginStrategy#getShortName()
jenkinsci · Jun 8, 2018 · ec10b8c · ec10b8c
2 parents 8c1b8b8 + 9bd1332
commit ec10b8c
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -25,6 +25,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
@@ -110,11 +112,20 @@ public ClassicPluginStrategy(PluginManager pluginManager) {
 
     @Override public String getShortName(File archive) throws IOException {
         Manifest manifest;
+        if (!archive.exists()) {
+            throw new FileNotFoundException("Failed to load " + archive + ". The file does not exist");
+        } else if (!archive.isFile()) {
+            throw new FileNotFoundException("Failed to load " + archive + ". It is not a file");
+        }
+
         if (isLinked(archive)) {
             manifest = loadLinkedManifest(archive);
         } else {
             try (JarFile jf = new JarFile(archive, false)) {
                 manifest = jf.getManifest();
+            } catch (IOException ex) {
+                // Mention file name in the exception
+                throw new IOException("Failed to load " + archive, ex);
             }
         }
         return PluginWrapper.computeShortName(manifest, archive.getName());