This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-base.git
commit 3de2b9f6258bb3dda6bf3cfcf9c39a531fbcc020 Author: Robert Munteanu <[email protected]> AuthorDate: Wed Aug 8 12:42:31 2018 +0300 SLING-7811 - NPE when repository is starting up Make sure that each repository startup thread has an individual name. This makes it easier to distinguish repository restart issues during startup. --- .../org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java b/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java index bedb9e7..002d8bc 100644 --- a/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java +++ b/src/main/java/org/apache/sling/jcr/base/AbstractSlingRepositoryManager.java @@ -85,6 +85,8 @@ import org.slf4j.LoggerFactory; @ProviderType public abstract class AbstractSlingRepositoryManager { + private static final AtomicInteger startupCounter = new AtomicInteger(); + /** default log */ private final Logger log = LoggerFactory.getLogger(getClass()); @@ -452,7 +454,7 @@ public abstract class AbstractSlingRepositoryManager { // start repository asynchronously to allow LoginAdminWhitelist to become available // NOTE: making this conditional allows tests to register a mock whitelist before // activating the RepositoryManager, so they don't need to deal with async startup - startupThread = new Thread("Apache Sling Repository Startup Thread") { + startupThread = new Thread("Apache Sling Repository Startup Thread #" + startupCounter.incrementAndGet()) { @Override public void run() { try {
