Fix some quality flaws

1 files changed, 21 insertions, 22 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java b/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java
index 58e2d5ad0ad..9b971a24dc9 100644
--- a/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java
+++ b/sonar-server/src/main/java/org/sonar/server/plugins/ClassLoaderUtils.java
@@ -98,29 +98,28 @@ public final class ClassLoaderUtils {
       rootPath = StringUtils.removeStart(rootPath, "/");
 
       URL root = classLoader.getResource(rootPath);
-      if (root == null) {
-        return paths;
-      }
-      if (!"jar".equals(root.getProtocol())) {
-        throw new IllegalStateException("Unsupported protocol: " + root.getProtocol());
-      }
+      if (root != null) {
+        if (!"jar".equals(root.getProtocol())) {
+          throw new IllegalStateException("Unsupported protocol: " + root.getProtocol());
+        }
 
-      // Path of the root directory
-      // Examples :
-      // org/sonar/sqale/index.txt  -> rootDirectory is org/sonar/sqale
-      // org/sonar/sqale/  -> rootDirectory is org/sonar/sqale
-      // org/sonar/sqale  -> rootDirectory is org/sonar/sqale
-      String rootDirectory = rootPath;
-      if (StringUtils.substringAfterLast(rootPath, "/").indexOf('.') >= 0) {
-        rootDirectory = StringUtils.substringBeforeLast(rootPath, "/");
-      }
-      String jarPath = root.getPath().substring(5, root.getPath().indexOf("!")); //strip out only the JAR file
-      JarFile jar = new JarFile(URLDecoder.decode(jarPath, CharEncoding.UTF_8));
-      Enumeration<JarEntry> entries = jar.entries();
-      while (entries.hasMoreElements()) {
-        String name = entries.nextElement().getName();
-        if (name.startsWith(rootDirectory) && predicate.apply(name)) {
-          paths.add(name);
+        // Path of the root directory
+        // Examples :
+        // org/sonar/sqale/index.txt  -> rootDirectory is org/sonar/sqale
+        // org/sonar/sqale/  -> rootDirectory is org/sonar/sqale
+        // org/sonar/sqale  -> rootDirectory is org/sonar/sqale
+        String rootDirectory = rootPath;
+        if (StringUtils.substringAfterLast(rootPath, "/").indexOf('.') >= 0) {
+          rootDirectory = StringUtils.substringBeforeLast(rootPath, "/");
+        }
+        String jarPath = root.getPath().substring(5, root.getPath().indexOf("!")); //strip out only the JAR file
+        JarFile jar = new JarFile(URLDecoder.decode(jarPath, CharEncoding.UTF_8));
+        Enumeration<JarEntry> entries = jar.entries();
+        while (entries.hasMoreElements()) {
+          String name = entries.nextElement().getName();
+          if (name.startsWith(rootDirectory) && predicate.apply(name)) {
+            paths.add(name);
+          }
         }
       }
       return paths;