aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorJenkins CI <ci@sonarsource.com>2014-09-24 08:01:24 +0200
committerJenkins CI <ci@sonarsource.com>2014-09-24 08:01:24 +0200
commit1540fa46087dd1b5d26bc660a1989834b7def20f (patch)
treef9637df2815e3aa43e191ecf7c28017c47b9bc7f /server
parent5b7386b8b677e37f225b91807459fffff096bc7c (diff)
parent88816d6506972e505245763d0494807187e0dcc6 (diff)
downloadsonarqube-1540fa46087dd1b5d26bc660a1989834b7def20f.tar.gz
sonarqube-1540fa46087dd1b5d26bc660a1989834b7def20f.zip
Automatic merge from branch-4.5
* origin/branch-4.5: Fix quality flaw
Diffstat (limited to 'server')
-rw-r--r--server/sonar-process/src/main/java/org/sonar/process/ProcessCommands.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessCommands.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessCommands.java
index 417d62cb5bf..d79f0f92899 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessCommands.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessCommands.java
@@ -107,11 +107,9 @@ public class ProcessCommands {
}
private void deleteFile(File file) {
- if (file.exists()) {
- if (!file.delete()) {
- throw new MessageException(String.format(
- "Fail to delete file %s. Please check that no SonarQube process is alive", file));
- }
+ if (file.exists() && !file.delete()) {
+ throw new MessageException(String.format(
+ "Fail to delete file %s. Please check that no SonarQube process is alive", file));
}
}
}