aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/Batch.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/Batch.java b/sonar-batch/src/main/java/org/sonar/batch/Batch.java
index c2b15adda09..623192824fe 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/Batch.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/Batch.java
@@ -62,7 +62,13 @@ public class Batch {
analyzeModules(bootstrapComponents);
} finally {
if (bootstrapComponents != null) {
- bootstrapComponents.stop();
+ try {
+ bootstrapComponents.stop();
+ } catch (Exception e) {
+ // See http://jira.codehaus.org/browse/SONAR-2346
+ // This exception must not override the exception thrown during start() phase.
+ LOG.error("Fail to stop IoC container", e);
+ }
}
}
}