Fix some quality flaws

diff --git a/server/process/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java b/server/process/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
index 5251ca5bd0c03aeb2357e27fdf0f3ec422bb7513..869867a6e34b067286b581d11c87aefce606a61c 100644 (file)
--- a/server/process/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
+++ b/server/process/sonar-process/src/main/java/org/sonar/process/ProcessWrapper.java
@@ -73,6 +73,7 @@ public class ProcessWrapper extends Thread implements Terminable {
   private StreamGobbler errorGobbler;
   private StreamGobbler outputGobbler;
   private ProcessMXBean processMXBean;
+  private final Object terminationLock = new Object();
 
   public ProcessWrapper(String processName) {
     super(processName);
@@ -179,9 +180,6 @@ public class ProcessWrapper extends Thread implements Terminable {
     } catch (Exception e) {
       LOGGER.info("ProcessThread has been interrupted. Killing node.");
       LOGGER.trace("Process exception", e);
-    } finally {
-      ;
-      ;
     }
   }
 
@@ -257,7 +255,6 @@ public class ProcessWrapper extends Thread implements Terminable {
     return null;
   }
 
-  private final Integer terminationLock = new Integer(1);
   @Override
   public void terminate() {
     synchronized (terminationLock) {

diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
index 0fbb934c7c794b7f5a1853a02bb3332bcd100244..1abf733b66baa92d7eb805ce5415d0a477e819cd 100644 (file)
--- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
+++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java
@@ -58,7 +58,7 @@ public class SearchServer extends MonitoredProcess {
   private final boolean isBlocking;
 
   private Node node;
-  private final Integer lock = new Integer(1);
+  private final Object lock = new Object();
 
   @VisibleForTesting
   public SearchServer(final Props props, boolean monitored, boolean blocking) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java b/server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java
index 3ed0a7118ca5663f1df69b549df2104aeb6f6fe0..4c8b26f4baea47fa32aa45140c70b693e45c8c2f 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/SearchClient.java
@@ -119,11 +119,11 @@ public class SearchClient extends TransportClient implements Startable {
 
   @Override
   public void start() {
-
+    // nothing to do
   }
 
   @Override
   public void stop() {
-    super.close();
+    close();
   }
 }