Add a more meaningful error message when a plugin manifest can't be read

2 files changed, 19 insertions, 10 deletions

diff --git a/subprojects/sonar-update-center/sonar-update-center-common/src/main/java/org/sonar/updatecenter/common/PluginManifest.java b/subprojects/sonar-update-center/sonar-update-center-common/src/main/java/org/sonar/updatecenter/common/PluginManifest.java
index 3090793fca3..4934978abba 100644
--- a/subprojects/sonar-update-center/sonar-update-center-common/src/main/java/org/sonar/updatecenter/common/PluginManifest.java
+++ b/subprojects/sonar-update-center/sonar-update-center-common/src/main/java/org/sonar/updatecenter/common/PluginManifest.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.updatecenter.common;
 
-import static org.sonar.updatecenter.common.FormatUtils.toDate;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 
@@ -31,6 +29,8 @@ import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
+import static org.sonar.updatecenter.common.FormatUtils.toDate;
+
 /**
  * This class loads Sonar plugin metadata from JAR manifest.
  * 
@@ -78,14 +78,18 @@ public final class PluginManifest {
    * Load the manifest from a JAR file.
    */
   public PluginManifest(File file) throws IOException {
-    JarFile jar = new JarFile(file);
+    JarFile jar = null;
     try {
+      jar = new JarFile(file);
       if (jar.getManifest() != null) {
         loadManifest(jar.getManifest());
       }
-
+    } catch (Exception e) {
+      throw new RuntimeException("Unable to read plugin manifest from jar : " + file.getAbsolutePath(), e);
     } finally {
-      jar.close();
+      if (jar != null) {
+        jar.close();
+      }
     }
   }
 
diff --git a/subprojects/sonar-update-center/sonar-update-center-common/src/test/java/org/sonar/updatecenter/common/PluginManifestTest.java b/subprojects/sonar-update-center/sonar-update-center-common/src/test/java/org/sonar/updatecenter/common/PluginManifestTest.java
index 70d3dd666a4..6be112ae20c 100644
--- a/subprojects/sonar-update-center/sonar-update-center-common/src/test/java/org/sonar/updatecenter/common/PluginManifestTest.java
+++ b/subprojects/sonar-update-center/sonar-update-center-common/src/test/java/org/sonar/updatecenter/common/PluginManifestTest.java
@@ -19,11 +19,6 @@
  */
 package org.sonar.updatecenter.common;
 
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsNull.nullValue;
-import static org.hamcrest.number.OrderingComparisons.greaterThan;
-import static org.junit.Assert.assertThat;
-
 import org.junit.Test;
 
 import java.io.File;
@@ -31,8 +26,18 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsNull.nullValue;
+import static org.hamcrest.number.OrderingComparisons.greaterThan;
+import static org.junit.Assert.assertThat;
+
 public class PluginManifestTest {
 
+  @Test(expected = RuntimeException.class)
+  public void test() throws Exception {
+    new PluginManifest(new File("fake.jar"));
+  }
+
   @Test
   public void testCreateManifest() throws URISyntaxException, IOException {
     URL jar = getClass().getResource("/org/sonar/updatecenter/common/PluginManifestTest/checkstyle-plugin.jar");