Automatic merge from branch-4.5

* origin/branch-4.5:
  Remove debug stuff (logs and ...Thread.sleep)

2 files changed, 0 insertions, 10 deletions

diff --git a/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java b/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java
index 0b2139ab693..e317241e4f5 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java
@@ -78,17 +78,13 @@ public class HttpProcess implements Monitored {
 
   @Override
   public boolean isReady() {
-    System.out.println("received isReady()");
     if (ready) {
       return true;
     }
-    System.out.println("checking server.isStarted()");
     if (server.isStarted()) {
-      System.out.println("moving to ready");
       ready = true;
       writeTimeToFile("readyAt");
     }
-    System.out.println("ready: " + ready);
     return ready;
   }
 
@@ -105,7 +101,6 @@ public class HttpProcess implements Monitored {
   public void stop() {
     try {
       if (!server.isStopped()) {
-        System.out.println("HttpProcess stopping");
         server.stop();
         writeTimeToFile("terminatedAt");
       }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java b/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
index a4c6ebc59ad..01a5305c53d 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/app/EmbeddedTomcat.java
@@ -85,15 +85,10 @@ class EmbeddedTomcat {
   }
 
   void terminate() {
-    LoggerFactory.getLogger(getClass()).info("--- RECEIVED TERMINATE TOMCAT");
     if (tomcat.getServer().getState().isAvailable()) {
       try {
-        LoggerFactory.getLogger(getClass()).info("--- STOP TOMCAT");
         tomcat.stop();
         tomcat.destroy();
-        LoggerFactory.getLogger(getClass()).info("--- TOMCAT TERMINATION - WAIT 10s");
-        Thread.sleep(10000L);
-        LoggerFactory.getLogger(getClass()).info("--- TOMCAT TERMINATED AFTER 10s");
       } catch (Exception e) {
         LoggerFactory.getLogger(EmbeddedTomcat.class).error("Fail to stop web server", e);
       }