aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src/main/java/org/sonar/application
diff options
context:
space:
mode:
authorStephane Gamard <stephane.gamard@sonarsource.com>2014-08-29 16:39:40 +0200
committerStephane Gamard <stephane.gamard@sonarsource.com>2014-08-29 16:39:59 +0200
commit13b665ea32bad155c6e5aae5e7bc2d45a52fb108 (patch)
tree734fbf63a7bc2181463061203a98e5b673500313 /sonar-application/src/main/java/org/sonar/application
parentf884ddaf30b7f0d8cdec2e6d385e01ed8d36ef7c (diff)
downloadsonarqube-13b665ea32bad155c6e5aae5e7bc2d45a52fb108.tar.gz
sonarqube-13b665ea32bad155c6e5aae5e7bc2d45a52fb108.zip
Null authorName instead of "Not Yet Implemented"
Diffstat (limited to 'sonar-application/src/main/java/org/sonar/application')
-rw-r--r--sonar-application/src/main/java/org/sonar/application/App.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index eb7433f83dc..76ac6a16605 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -126,6 +126,10 @@ public class App implements ProcessMXBean {
@Override
public void terminate() {
+ if (monitor != null && monitor.isAlive()) {
+ monitor.terminate();
+ monitor = null;
+ }
if (server != null) {
server.terminate();
server = null;
@@ -134,11 +138,6 @@ public class App implements ProcessMXBean {
elasticsearch.terminate();
elasticsearch = null;
}
- if (monitor != null && monitor.isAlive()) {
- monitor.terminate();
- monitor.interrupt();
- monitor = null;
- }
}
private boolean isSuccess() {