[geode] branch develop updated: GEODE-10335_1: add compareAndSet (#7850)

[mivanac]

This is an automated email from the ASF dual-hosted git repository.

mivanac pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new ac8b1786ac GEODE-10335_1: add compareAndSet (#7850)
ac8b1786ac is described below

commit ac8b1786ac5b70e1e252de9726ddcb0a927705d7
Author: Mario Ivanac <48509724+miva...@users.noreply.github.com>
AuthorDate: Fri Sep 9 15:05:39 2022 +0200

    GEODE-10335_1: add compareAndSet (#7850)
---
 .../main/java/org/apache/geode/internal/cache/TXManagerImpl.java    | 6 ++----
 .../java/org/apache/geode/internal/cache/TXManagerImplTest.java     | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
index 1dacdcd06d..e901a03bd5 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/TXManagerImpl.java
@@ -688,10 +688,8 @@ public class TXManagerImpl implements 
CacheTransactionManager, MembershipListene
     for (final TransactionListener listener : listeners) {
       closeListener(listener);
     }
-    TXManagerImpl instance = currentInstance.get();
-    if (instance != null) {
-      currentInstance.set(null);
-    }
+
+    currentInstance.compareAndSet(this, null);
   }
 
   private void closeListener(TransactionListener tl) {
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
index 24b1af2ccb..a0e6cd8f44 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/TXManagerImplTest.java
@@ -72,7 +72,6 @@ public class TXManagerImplTest {
   public void setUp() {
     cache = Fakes.cache();
     dm = mock(ClusterDistributionManager.class);
-    txMgr = new TXManagerImpl(mock(CachePerfStats.class), cache, 
disabledClock());
     txid = new TXId(null, 0);
     msg = mock(DestroyMessage.class);
     txCommitMsg = mock(TXCommitMessage.class);
@@ -94,6 +93,9 @@ public class TXManagerImplTest {
     spyTxMgr = spy(new TXManagerImpl(mock(CachePerfStats.class), spyCache, 
disabledClock()));
     timer = mock(SystemTimer.class);
     doReturn(timer).when(spyCache).getCCPTimer();
+
+    txMgr = new TXManagerImpl(mock(CachePerfStats.class), cache, 
disabledClock());
+
   }
 
   @Test