SONAR-22152 Silent NoClassDefFoundError: ThrowableProxy from JGit

1 files changed, 12 insertions, 0 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
index 19b90c180fa..2a105bc466a 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/batch/bootstrapper/Batch.java
@@ -25,6 +25,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.annotation.Nullable;
+import org.eclipse.jgit.internal.util.ShutdownHook;
+import org.slf4j.LoggerFactory;
 import org.sonar.api.utils.MessageException;
 import org.sonar.scanner.bootstrap.EnvironmentConfig;
 import org.sonar.scanner.bootstrap.SpringGlobalContainer;
@@ -73,6 +75,16 @@ public final class Batch {
       SpringGlobalContainer.create(scannerProperties, components).execute();
     } catch (RuntimeException e) {
       throw handleException(e);
+    } finally {
+      // Workaround for SONAR-22152
+      // Call the cleanup method ourselves to avoid ClassNotFound errors when the Shutdown hook is called after the classloader is closed
+      try {
+        var cleanupMethod = ShutdownHook.class.getDeclaredMethod("cleanup");
+        cleanupMethod.setAccessible(true);
+        cleanupMethod.invoke(ShutdownHook.INSTANCE);
+      } catch (Exception e) {
+        LoggerFactory.getLogger(Batch.class).debug("Failed to call JGit cleanup method", e);
+      }
     }
     return this;
   }