fix bookmarks

neo4j · Aug 31, 2022 · 33f47a4 · 33f47a4
1 parent 5d787cd
commit 33f47a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Neo4j.Driver/Neo4j.Driver/Internal/AsyncSession.cs b/Neo4j.Driver/Neo4j.Driver/Internal/AsyncSession.cs
@@ -280,9 +280,10 @@ private async Task AcquireConnectionAndDbNameAsync(AccessMode mode)
         {
             if (_useBookmarkManager)
                 _bookmarks = _bookmarks == null
-                    ? Bookmarks.From(_bookmarkManager.GetAllBookmarks())
+                    ? Bookmarks.From(_bookmarkManager.GetBookmarks("system"))
                     : Bookmarks.From(_bookmarkManager.GetAllBookmarks().Concat(_bookmarks?.Values));
 
+
             _connection = await _connectionProvider.AcquireAsync(mode, _database, ImpersonatedUser(), _bookmarks)
                 .ConfigureAwait(false);
 

diff --git a/Neo4j.Driver/Neo4j.Driver/Internal/DefaultBookmarkManager.cs b/Neo4j.Driver/Neo4j.Driver/Internal/DefaultBookmarkManager.cs
@@ -25,7 +25,7 @@ namespace Neo4j.Driver.Internal;
 internal class DefaultBookmarkManager : IBookmarkManager
 {
     private Dictionary<string, HashSet<string>> _bookmarkSets;
-    private readonly Func<string, string[]> _bookmarkSupplier;
+    private readonly Func<string?, string[]> _bookmarkSupplier;
     private readonly Action<string, string[]> _onBookmarks;
     private readonly SemaphoreSlim _lock;
 
@@ -107,8 +107,7 @@ public string[] GetAllBookmarks()
         if (_bookmarkSupplier == null)
             return set.ToArray();
 
-        foreach (var key in keys)
-            set.UnionWith(_bookmarkSupplier(key));
+        set.UnionWith(_bookmarkSupplier(null));
 
         return set.ToArray();
     }