Automatic merge from branch-6.7

* origin/branch-6.7:
  SONAR-9973 IT for report processing resilient to failure during start
  SONAR-9973 TaskContainer now support errors during start of components
  SONAR-9973 add IT ensuring resilience of Ce Workers to exceptions
  SONAR-9973 ComponentContainer#stopComponent now never fail

1 files changed, 4 insertions, 6 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
index 9d745c53008..d324618ea43 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
@@ -67,12 +67,10 @@ public final class Batch {
   public synchronized Batch execute() {
     configureLogging();
     doStart();
-    boolean threw = true;
     try {
       doExecuteTask(globalProperties);
-      threw = false;
     } finally {
-      doStop(threw);
+      doStop();
     }
     return this;
   }
@@ -150,12 +148,12 @@ public final class Batch {
   public synchronized void stop() {
     checkStarted();
     configureLogging();
-    doStop(false);
+    doStop();
   }
 
-  private void doStop(boolean swallowException) {
+  private void doStop() {
     try {
-      bootstrapContainer.stopComponents(swallowException);
+      bootstrapContainer.stopComponents();
     } catch (RuntimeException e) {
       throw handleException(e);
     }