diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-12-10 17:06:44 +0100 |
|---|---|---|
| committer | Duarte Meneses <duarte.meneses@sonarsource.com> | 2015-12-21 09:24:35 +0100 |
| commit | 8239ac084eb9aaaba9f661a4e2fe5891bda8d452 (patch) | |
| tree | e8671ff750ad840a57c5c3268bc3b2b028f32f81 /sonar-batch/src/main/java/org/sonar/batch | |
| parent | 13a6da5b9d25ef38b92b140fef845a46e6325939 (diff) | |
| download | sonarqube-8239ac084eb9aaaba9f661a4e2fe5891bda8d452.tar.gz sonarqube-8239ac084eb9aaaba9f661a4e2fe5891bda8d452.zip | |
SONAR-7121 Project's File Lock not released on error
Diffstat (limited to 'sonar-batch/src/main/java/org/sonar/batch')
| -rw-r--r-- | sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java index 7c5e87050f9..427f5c3fb7d 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectScanContainer.java @@ -117,6 +117,20 @@ public class ProjectScanContainer extends ComponentContainer { } } + @Override + public ComponentContainer startComponents() { + try { + return super.startComponents(); + } catch (Exception e) { + // ensure that lock is released + ProjectLock lock = getComponentByType(ProjectLock.class); + if (lock != null) { + lock.stop(); + } + throw e; + } + } + private void addBatchComponents() { add( props, |