From 09f05d59b05849955dee633437c0814512fd0997 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Wed, 27 Aug 2014 16:46:44 +0200 Subject: [PATCH] Fix regression caused by SONAR-5349 --- .../java/org/sonar/batch/scan/ProjectReactorValidator.java | 5 +++-- .../src/main/java/org/sonar/core/resource/ResourceDao.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java index 67a226151d3..7b53b884b94 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/ProjectReactorValidator.java @@ -25,6 +25,7 @@ import org.sonar.api.CoreProperties; import org.sonar.api.batch.bootstrap.ProjectDefinition; import org.sonar.api.batch.bootstrap.ProjectReactor; import org.sonar.api.config.Settings; +import org.sonar.api.resources.Qualifiers; import org.sonar.api.utils.SonarException; import org.sonar.core.component.ComponentKeys; import org.sonar.core.resource.ResourceDao; @@ -88,8 +89,8 @@ public class ProjectReactorValidator { // SONAR-4692 Validate root project is the same than previous analysis to avoid module with same key in different projects String moduleKey = ComponentKeys.createKey(moduleDef.getKey(), branch); ResourceDto rootInDB = resourceDao.getRootProjectByComponentKey(moduleKey); - if (rootInDB == null) { - // This is a new module so OK + if (rootInDB == null || Qualifiers.LIBRARY.equals(rootInDB.getQualifier())) { + // This is a new module or previously a library so OK return; } if (rootInDB.getKey().equals(moduleKey)) { diff --git a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java index dd1095d88ba..94b54f042b6 100644 --- a/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java +++ b/sonar-core/src/main/java/org/sonar/core/resource/ResourceDao.java @@ -202,7 +202,7 @@ public class ResourceDao implements DaoComponent { /** * Return the root project of a component. * Will return the component itself if it's already the root project - * Can return null if the component that does exists. + * Can return null if the component does not exists. * * The implementation should rather use a new column already containing the root project, see https://jira.codehaus.org/browse/SONAR-5188. */ -- 2.39.5