commit eae43772dc4bdffdfc83d92f91691801495b760a
author Jacob Barrett <jbarrett@pivotal.io> Sun Jan 17 16:48:14 2021 -0800
committer Jacob Barrett <jabarrett@vmware.com> Sun Jan 17 18:54:19 2021 -0800
tree aad82ac84242496e9df14275ee9d41d80b139b79
parent 3a57b956acc098dce083129334bbc2403d626176

GEODE-8844: Fixes double check locking.

Failure to fetch reference after locking can result in multiple initializations.

geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java

diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 8846e67..4dd9d13 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -4363,6 +4363,7 @@
     QueryMonitor tempQueryMonitor = queryMonitor;
     if (tempQueryMonitor == null) {
       synchronized (queryMonitorLock) {
+        tempQueryMonitor = queryMonitor;
         if (tempQueryMonitor == null) {
           int maxTime = MAX_QUERY_EXECUTION_TIME;