fix: Sent bookmark updated event only while bookmarks are locked.

michael-simons · michael-simons · commit 42d936ade4ac · 2023-10-19T18:16:59.000+02:00
diff --git a/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveDefaultBookmarkManager.java b/src/main/java/org/springframework/data/neo4j/core/transaction/ReactiveDefaultBookmarkManager.java
@@ -60,9 +60,9 @@ public void updateBookmarks(Collection<Bookmark> usedBookmarks, Collection<Bookm
 		synchronized (this.bookmarks) {
 			usedBookmarks.stream().filter(Objects::nonNull).forEach(bookmarks::remove);
 			newBookmarks.stream().filter(Objects::nonNull).forEach(bookmarks::add);
-		}
-		if (applicationEventPublisher != null) {
-			applicationEventPublisher.publishEvent(new Neo4jBookmarksUpdatedEvent(new HashSet<>(bookmarks)));
+			if (applicationEventPublisher != null) {
+				applicationEventPublisher.publishEvent(new Neo4jBookmarksUpdatedEvent(new HashSet<>(bookmarks)));
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ public void updateBookmarks(Collection<Bookmark> usedBookmarks, Collection<Bookm`
`60`	`60`	`synchronized (this.bookmarks) {`
`61`	`61`	`usedBookmarks.stream().filter(Objects::nonNull).forEach(bookmarks::remove);`
`62`	`62`	`newBookmarks.stream().filter(Objects::nonNull).forEach(bookmarks::add);`
`63`		`- }`
`64`		`- if (applicationEventPublisher != null) {`
`65`		`- applicationEventPublisher.publishEvent(new Neo4jBookmarksUpdatedEvent(new HashSet<>(bookmarks)));`
	`63`	`+ if (applicationEventPublisher != null) {`
	`64`	`+ applicationEventPublisher.publishEvent(new Neo4jBookmarksUpdatedEvent(new HashSet<>(bookmarks)));`
	`65`	`+ }`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`