Skip to content

Fix thread safety in Neo4jBookmarkManager #1604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2025
Merged

Fix thread safety in Neo4jBookmarkManager #1604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions driver/src/main/java/org/neo4j/driver/internal/Neo4jBookmarkManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public void updateBookmarks(Set<Bookmark> previousBookmarks, Set<Bookmark> newBo
var immutableBookmarks = executeWithLock(rwLock.writeLock(), () -> {
this.bookmarks.removeAll(previousBookmarks);
this.bookmarks.addAll(newBookmarks);
return Collections.unmodifiableSet(this.bookmarks);
return Collections.unmodifiableSet(new HashSet<>(this.bookmarks));
});
if (updateListener != null) {
updateListener.accept(immutableBookmarks);
Expand All @@ -67,12 +67,10 @@ public void updateBookmarks(Set<Bookmark> previousBookmarks, Set<Bookmark> newBo

@Override
public Set<Bookmark> getBookmarks() {
var immutableBookmarks = executeWithLock(rwLock.readLock(), () -> Collections.unmodifiableSet(this.bookmarks));
var bookmarks = executeWithLock(rwLock.readLock(), () -> new HashSet<>(this.bookmarks));
if (bookmarksSupplier != null) {
var bookmarks = new HashSet<>(immutableBookmarks);
bookmarks.addAll(bookmarksSupplier.get());
immutableBookmarks = Collections.unmodifiableSet(bookmarks);
}
return immutableBookmarks;
return Collections.unmodifiableSet(bookmarks);
}
}