From 612c2814ec30a36437a6fe98215223a0eb45ac1c Mon Sep 17 00:00:00 2001
From: "antoine.vinot" <antoine.vinot@sonarsource.com>
Date: Thu, 12 Dec 2024 09:11:16 +0100
Subject: SONAR-22265 Fix trying to get referenceBranch for main branch

---
 .../ce/task/projectanalysis/source/OriginalFileResolver.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'server/sonar-ce-task-projectanalysis')

diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/OriginalFileResolver.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/OriginalFileResolver.java
index 8cda1cfaf52..094bcec3f79 100644
--- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/OriginalFileResolver.java
+++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/OriginalFileResolver.java
@@ -70,9 +70,11 @@ public class OriginalFileResolver {
 
       }
 
-      String componentUuidFromReferenceBranch = referenceBranchComponentUuids.getComponentUuid(file.getKey());
-      if (componentUuidFromReferenceBranch != null) {
-        return Optional.of(componentUuidFromReferenceBranch);
+      if (!analysisMetadataHolder.getBranch().isMain()) {
+        String componentUuidFromReferenceBranch = referenceBranchComponentUuids.getComponentUuid(file.getKey());
+        if (componentUuidFromReferenceBranch != null) {
+          return Optional.of(componentUuidFromReferenceBranch);
+        }
       }
 
     }
-- 
cgit v1.2.3