From 1ae73c85fcc7080f2458f16e6ace791e9d751a5a Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Tue, 9 Sep 2014 10:33:28 +0200 Subject: [PATCH] SONAR-2860 Fix "Project is not yet initialized" error (lifecycle issue) --- .../main/java/org/sonar/batch/phases/ProjectInitializer.java | 1 - .../main/java/org/sonar/batch/scan/ModuleScanContainer.java | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sonar-batch/src/main/java/org/sonar/batch/phases/ProjectInitializer.java b/sonar-batch/src/main/java/org/sonar/batch/phases/ProjectInitializer.java index 43f557a3c44..7194f548f02 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/phases/ProjectInitializer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/phases/ProjectInitializer.java @@ -41,7 +41,6 @@ public class ProjectInitializer implements BatchComponent { } public void execute(Project project) { - project.setSettings(settings); if (project.getLanguage() == null) { initDeprecatedLanguage(project); } diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java index 800210aa1c9..64ef5fb2ddc 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ModuleScanContainer.java @@ -110,8 +110,9 @@ public class ModuleScanContainer extends ComponentContainer { module, ModuleSettings.class); - // hack to initialize commons-configuration before ExtensionProviders - getComponentByType(ModuleSettings.class); + // hack to initialize settings before ExtensionProviders + ModuleSettings moduleSettings = getComponentByType(ModuleSettings.class); + module.setSettings(moduleSettings); add( EventBus.class, -- 2.39.5