Fixing retry for any

johanhaleby · Oct 11, 2024 · 4be5bcf · 4be5bcf
1 parent dbcb5cc
commit 4be5bcf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...b/native/src/main/java/org/occurrent/eventstore/mongodb/nativedriver/MongoEventStore.java b/...b/native/src/main/java/org/occurrent/eventstore/mongodb/nativedriver/MongoEventStore.java
@@ -225,7 +225,7 @@ public WriteResult write(String streamId, WriteCondition writeCondition, Stream<
             }
         };
 
-        return RetryStrategy.retry().retryIf(__ -> writeCondition.isAnyStreamVersion()).execute(writeEvents);
+        return RetryStrategy.retry().retryIf(e -> e instanceof WriteConditionNotFulfilledException && writeCondition.isAnyStreamVersion()).execute(writeEvents);
     }
 
     private List<Document> convertCloudEventsToDocuments(String streamId, Stream<CloudEvent> cloudEvents, long currentStreamVersion) {

diff --git a/...src/main/java/org/occurrent/eventstore/mongodb/spring/blocking/SpringMongoEventStore.java b/...src/main/java/org/occurrent/eventstore/mongodb/spring/blocking/SpringMongoEventStore.java
@@ -149,7 +149,7 @@ public WriteResult write(String streamId, WriteCondition writeCondition, Stream<
         };
 
         StreamVersionDiff streamVersion = RetryStrategy.retry()
-                .retryIf(__ -> writeCondition.isAnyStreamVersion())
+                .retryIf(e -> e instanceof WriteConditionNotFulfilledException && writeCondition.isAnyStreamVersion())
                 .execute(() -> transactionTemplate.execute(writeLogic));
         return new WriteResult(streamId, streamVersion.oldStreamVersion, streamVersion.newStreamVersion);
     }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             };
-            return RetryStrategy.retry().retryIf(__ -> writeCondition.isAnyStreamVersion()).execute(writeEvents);
+            return RetryStrategy.retry().retryIf(e -> e instanceof WriteConditionNotFulfilledException && writeCondition.isAnyStreamVersion()).execute(writeEvents);
         }
         private List<Document> convertCloudEventsToDocuments(String streamId, Stream<CloudEvent> cloudEvents, long currentStreamVersion) {
@@ Expand Down @@