Merge pull request conductor-oss#223 from aradu-atlassian/dependency/…

…bump-guava Bump guava to 33.2.1-jre latest of right now to fix vulnerabilities.
ccctechcenter · Aug 9, 2024 · 1ab9169 · 1ab9169
2 parents 07c9063 + 4c7aa0f
commit 1ab9169
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -29,7 +29,7 @@ ext {
     revEurekaClient = '1.10.10'
     revGroovy = '4.0.9'
     revGrpc = '1.57.2'
-    revGuava = '30.0-jre'
+    revGuava = '33.2.1-jre'
     revHamcrestAllMatchers = '1.8'
     revHealth = '1.1.4'
     revPostgres = '42.7.2'

diff --git a/...stence/src/test/java/com/netflix/conductor/postgres/dao/PostgresPollDataDAOCacheTest.java b/...stence/src/test/java/com/netflix/conductor/postgres/dao/PostgresPollDataDAOCacheTest.java
@@ -94,25 +94,11 @@ private List<Map<String, Object>> queryDb(String query) throws SQLException {
 
     private void waitForCacheFlush() throws InterruptedException {
         long startTime = System.currentTimeMillis();
-        long lastDiff =
-                System.currentTimeMillis() - ((PostgresPollDataDAO) pollDataDAO).getLastFlushTime();
+        long lastFlushTime = ((PostgresPollDataDAO) pollDataDAO).getLastFlushTime();
 
-        if (lastDiff == 0) {
-            return;
-        }
-
-        while (true) {
-            long currentDiff =
-                    System.currentTimeMillis()
-                            - ((PostgresPollDataDAO) pollDataDAO).getLastFlushTime();
-
-            if (currentDiff < lastDiff || System.currentTimeMillis() - startTime > 1000) {
-                return;
-            }
-
-            lastDiff = currentDiff;
-
-            Thread.sleep(1);
+        while (System.currentTimeMillis() - startTime < 1000
+                && lastFlushTime <= ((PostgresPollDataDAO) pollDataDAO).getLastFlushTime()) {
+            Thread.sleep(10);
         }
     }