From 13b665ea32bad155c6e5aae5e7bc2d45a52fb108 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@sonarsource.com>
Date: Fri, 29 Aug 2014 16:39:40 +0200
Subject: Null authorName instead of "Not Yet Implemented"

---
 .../java/org/sonar/server/qualityprofile/QProfileActivity.java   | 4 ++--
 sonar-application/src/main/java/org/sonar/application/App.java   | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivity.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivity.java
index fb35bab419d..167beb1b4fa 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivity.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActivity.java
@@ -35,8 +35,8 @@ import java.util.Map;
  */
 public class QProfileActivity extends ActivityDoc implements Activity {
 
-  private String ruleName = "Not Yet Implemented";
-  private String authorName = "Not Yet Implemented";
+  private String ruleName = null;
+  private String authorName = null;
 
   protected QProfileActivity(Map<String, Object> fields) {
     super(fields);
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() {
-- 
cgit v1.2.3