From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Tue, 21 Apr 2015 15:08:04 +0000 (+0200)
Subject: Fix quality flaw
X-Git-Tag: 5.2-RC1~2167
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=75188ae1fb37c01ff970614725f8e9c0b228bce7;p=sonarqube.git

Fix quality flaw
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java b/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java
index ac5242da4cb..df520c3900a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/DefaultServerFileSystem.java
@@ -71,12 +71,16 @@ public class DefaultServerFileSystem implements ServerFileSystem, Startable {
 
     File deployDir = getDeployDir();
     if (deployDir == null) {
-      throw new IllegalArgumentException("Web app directory does not exist: " + getDeployDir());
+      throw new IllegalArgumentException("Web app directory does not exist");
     }
     try {
       FileUtils.forceMkdir(deployDir);
-      for (File subDirectory : deployDir.listFiles((FileFilter) FileFilterUtils.directoryFileFilter())) {
-        FileUtils.cleanDirectory(subDirectory);
+      FileFilter fileFilter = FileFilterUtils.directoryFileFilter();
+      File[] files = deployDir.listFiles(fileFilter);
+      if (files != null) {
+        for (File subDirectory : files) {
+          FileUtils.cleanDirectory(subDirectory);
+        }
       }
     } catch (IOException e) {
       throw new IllegalStateException("The following directory can not be created: " + deployDir.getAbsolutePath(), e);