SONAR-2860 Fix "Project is not yet initialized" error (lifecycle issue)

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 43f557a3c4400d16240abbd9ac90702bf8aaf258..7194f548f02377a4c9f8afd7eaa338376f3fb3cd 100644 (file)
--- 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 800210aa1c9f6cacc3946ea7ff84b9ccf5de02d6..64ef5fb2ddcfefc381ff5960a44cdc5c57983710 100644 (file)
--- 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,