From f473e40bfc25f6b6dda17a229d7646a6dce9666b Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Thu, 12 Nov 2020 13:58:16 +1300 Subject: [PATCH] #2098 - Refactor simplify SequenceIdGenerator.loadInBackground() to use AtomicBoolean --- .../dbplatform/SequenceIdGenerator.java | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java index 4ac975944..351d1e8b8 100644 --- a/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java +++ b/ebean-api/src/main/java/io/ebean/config/dbplatform/SequenceIdGenerator.java @@ -16,6 +16,7 @@ import java.util.Collections; import java.util.List; import java.util.NavigableSet; import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.ReentrantLock; /** @@ -42,7 +43,7 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator { protected final int allocationSize; - protected boolean currentlyBackgroundLoading; + protected AtomicBoolean currentlyBackgroundLoading = new AtomicBoolean(false); /** * Construct given a dataSource and sql to return the next sequence value. @@ -128,27 +129,16 @@ public abstract class SequenceIdGenerator implements PlatformIdGenerator { * Load another batch of Id's using a background thread. */ protected void loadInBackground(final int requestSize) { - // single threaded processing... - loadLock.lock(); - try { - if (currentlyBackgroundLoading) { - // skip as already background loading - logger.debug("... skip background sequence load (another load in progress)"); - return; - } - currentlyBackgroundLoading = true; - backgroundExecutor.execute(() -> { - loadMore(requestSize); - loadLock.lock(); - try { - currentlyBackgroundLoading = false; - } finally { - loadLock.unlock(); - } - }); - } finally { - loadLock.lock(); + if (currentlyBackgroundLoading.get()) { + // skip as already background loading + logger.debug("... skip background sequence load (another load in progress)"); + return; } + currentlyBackgroundLoading.set(true); + backgroundExecutor.execute(() -> { + loadMore(requestSize); + currentlyBackgroundLoading.set(false); + }); } /**