Fix false-positive in api/ce/is_queue_empty on mysql

diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
index 7ae95f8dd9d2e9a80d9c2acf9542bd5d161a1143..7accd1f4264a1014ba4ed6ab62635abbf840e159 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ce/ws/IsQueueEmptyWs.java
@@ -24,6 +24,7 @@ import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.RequestHandler;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
+import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 
@@ -69,10 +70,14 @@ public class IsQueueEmptyWs implements WebService {
 
     @Override
     public void handle(Request request, Response response) throws Exception {
+      boolean isQueueEmpty = false;
       try (DbSession dbSession = dbClient.openSession(false)) {
-        boolean isQueueEmpty = dbClient.ceQueueDao().selectAllInAscOrder(dbSession).isEmpty();
-        IOUtils.write(String.valueOf(isQueueEmpty), response.stream().output(), UTF_8);
+        isQueueEmpty = dbClient.ceQueueDao().selectAllInAscOrder(dbSession).isEmpty();
+      } catch (Exception e) {
+        // ignore this FP : https://gist.github.com/simonbrandhof/3d98f854d427519ef5b858a73b59585b
+        Loggers.get(getClass()).error("Cannot select rows from ce_queue", e);
       }
+      IOUtils.write(String.valueOf(isQueueEmpty), response.stream().output(), UTF_8);
     }
   }
 }