From 13d72d45c64907026ffb9b885c1c68599ff81012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Mon, 6 Sep 2021 08:40:22 +0200 Subject: [PATCH] Prevent multiple instances of working copy pool (#1797) The working copy pool has to be a singleton, because otherwise there could be multiple instances with their own caches and therefore no reuse and maybe more relevant working directories that will never be deleted. --- gradle/changelog/single_working_copy_pool.yaml | 2 ++ .../sonia/scm/repository/work/SimpleCachingWorkingCopyPool.java | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 gradle/changelog/single_working_copy_pool.yaml diff --git a/gradle/changelog/single_working_copy_pool.yaml b/gradle/changelog/single_working_copy_pool.yaml new file mode 100644 index 0000000000..53e90a234f --- /dev/null +++ b/gradle/changelog/single_working_copy_pool.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Prevent multiple working copy pools ([#1797](https://github.com/scm-manager/scm-manager/issues/1797)) diff --git a/scm-core/src/main/java/sonia/scm/repository/work/SimpleCachingWorkingCopyPool.java b/scm-core/src/main/java/sonia/scm/repository/work/SimpleCachingWorkingCopyPool.java index d57b3cfeed..ed2e4822e9 100644 --- a/scm-core/src/main/java/sonia/scm/repository/work/SimpleCachingWorkingCopyPool.java +++ b/scm-core/src/main/java/sonia/scm/repository/work/SimpleCachingWorkingCopyPool.java @@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory; import sonia.scm.util.IOUtil; import javax.inject.Inject; +import javax.inject.Singleton; import java.io.File; import java.util.LinkedHashMap; import java.util.Map; @@ -81,6 +82,7 @@ import static java.util.Optional.of; *
  • Wait for a cached directory on parallel requests
    • * */ +@Singleton public class SimpleCachingWorkingCopyPool implements WorkingCopyPool { public static final int DEFAULT_WORKING_COPY_POOL_SIZE = 5;