From 4d3ff40e56bea1b68aafbc42a8b9a896f2958ad9 Mon Sep 17 00:00:00 2001
From: Miguel Rosa <miguel@equalsmagic.com>
Date: Fri, 22 Sep 2017 10:41:28 +0100
Subject: [PATCH] Locking behavior conditional to caching being enabled

---
 src/main/java/org/dataloader/DataLoader.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/dataloader/DataLoader.java b/src/main/java/org/dataloader/DataLoader.java
index a3fdc2b..91e223b 100644
--- a/src/main/java/org/dataloader/DataLoader.java
+++ b/src/main/java/org/dataloader/DataLoader.java
@@ -180,10 +180,12 @@ public CompletableFuture<V> load(K key) {
         Object cacheKey = getCacheKey(nonNull(key));
         stats.incrementLoadCount();
 
-        synchronized (futureCache) {
-            if (loaderOptions.cachingEnabled() && futureCache.containsKey(cacheKey)) {
-                stats.incrementCacheHitCount();
-                return futureCache.get(cacheKey);
+        if (loaderOptions.cachingEnabled()) {
+            synchronized (futureCache) {
+                if (futureCache.containsKey(cacheKey)) {
+                    stats.incrementCacheHitCount();
+                    return futureCache.get(cacheKey);
+                }
             }
         }