SONARPLUGINS-2421 Make it possible to define a multi-modules project whose modules share the same project base directory

1 files changed, 7 insertions, 1 deletions

diff --git a/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java b/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java
index 40e715f..60ddfb1 100644
--- a/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java
+++ b/src/main/java/org/sonar/runner/internal/batch/SonarProjectBuilder.java
@@ -193,7 +193,13 @@ public final class SonarProjectBuilder {
     if (moduleProps.containsKey(PROPERTY_PROJECT_BASEDIR)) {
       File baseDir = getFileFromPath(moduleProps.getProperty(PROPERTY_PROJECT_BASEDIR), parentProject.getBaseDir());
       setProjectBaseDir(baseDir, moduleProps, moduleId);
-      tryToFindAndLoadPropsFile(baseDir, moduleProps, moduleId);
+      try {
+        if (!parentProject.getBaseDir().getCanonicalFile().equals(baseDir.getCanonicalFile())) {
+          tryToFindAndLoadPropsFile(baseDir, moduleProps, moduleId);
+        }
+      } catch (IOException e) {
+        throw new RunnerException("Error when resolving baseDir", e);
+      }
     } else if (moduleProps.containsKey(PROPERTY_PROJECT_CONFIG_FILE)) {
       loadPropsFile(parentProject, moduleProps, moduleId);
     } else {