From fc3d028cae340b4cf13064d74b0b16e2fbd6b99e Mon Sep 17 00:00:00 2001
From: maheshnikam <55378196+nikam14@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:17:31 +0530
Subject: [PATCH] [fix][test] Fix flaky test
 LeaderElectionTest.revalidateLeaderWithinSameSession (#22383)

(cherry picked from commit 216b83008deb469e0fc55ed8117f0c393ebcb0ac)
(cherry picked from commit e63dcd4c5e55d1a1e2dffac886ee0f1719326986)
---
 .../java/org/apache/pulsar/metadata/api/MetadataCache.java   | 2 +-
 .../org/apache/pulsar/metadata/BaseMetadataStoreTest.java    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java
index 6d558e709716d..31f7e50e994c5 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/api/MetadataCache.java
@@ -57,7 +57,7 @@ public interface MetadataCache<T> {
      *
      * @param path
      *            the path of the object in the metadata store
-     * @return the cached object or an empty {@link Optional} is the cache doesn't have the object
+     * @return the cached object or an empty {@link Optional} is the cache does not have the object
      */
     Optional<T> getIfCached(String path);
 
diff --git a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
index 411ee038c48b0..dd256d32f8ddb 100644
--- a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
+++ b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
@@ -127,10 +127,11 @@ public static void assertEqualsAndRetry(Supplier<Object> actual,
                                             int retryCount,
                                             long intSleepTimeInMillis) throws Exception {
         assertTrue(retryStrategically((__) -> {
-            if (actual.get().equals(expectedAndRetry)) {
+            Object actualObject = actual.get();
+            if (actualObject.equals(expectedAndRetry)) {
                 return false;
             }
-            assertEquals(actual.get(), expected);
+            assertEquals(actualObject, expected);
             return true;
         }, retryCount, intSleepTimeInMillis));
     }