[tinkerpop] branch master updated (0391479ae4 -> 77aba0050b)

[fl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git


    from 0391479ae4 merge from 3.6-dev
     add 365375b0f2 TINKERPOP-2944 Dispose Cancellation callbacks
     add 3765fc8bf5 Merge branch '3.5-dev' into 3.6-dev
     new 77aba0050b Merge branch '3.6-dev'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG.asciidoc                                 |  2 +-
 .../src/Gremlin.Net/Driver/Connection.cs           | 45 +++++++++++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

[tinkerpop] 01/01: Merge branch '3.6-dev'

[fl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

florianhockmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 77aba0050b3434e51eba53684ab856ec86e039ea
Merge: 0391479ae4 3765fc8bf5
Author: Florian Hockmann <fh...@florian-hockmann.de>
AuthorDate: Fri May 12 09:50:24 2023 +0200

    Merge branch '3.6-dev'

 CHANGELOG.asciidoc                                 |  2 +-
 .../src/Gremlin.Net/Driver/Connection.cs           | 45 +++++++++++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --cc gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
index 4fb37351fd,cabe587fcd..913bed279e
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/Connection.cs
@@@ -45,19 -45,17 +45,17 @@@ namespace Gremlin.Net.Drive
          private readonly IMessageSerializer _messageSerializer;
          private readonly Uri _uri;
          private readonly IWebSocketConnection _webSocketConnection;
 -        private readonly string _username;
 -        private readonly string _password;
 -        private readonly string _sessionId;
 +        private readonly string? _username;
 +        private readonly string? _password;
 +        private readonly string? _sessionId;
          private readonly bool _sessionEnabled;
  
-         private readonly ConcurrentQueue<(RequestMessage msg, CancellationToken cancellationToken)> _writeQueue =
-             new ConcurrentQueue<(RequestMessage, CancellationToken)>();
+         private readonly ConcurrentQueue<(RequestMessage msg, CancellationToken cancellationToken)> _writeQueue = new();
  
          private readonly ConcurrentDictionary<Guid, IResponseHandlerForSingleRequestMessage> _callbackByRequestId =
-             new ConcurrentDictionary<Guid, IResponseHandlerForSingleRequestMessage>();
-         
-         private readonly List<CancellationTokenRegistration> _cancellationTokenRegistrations =
-             new List<CancellationTokenRegistration>();
+             new();
+ 
+         private readonly ConcurrentDictionary<Guid, CancellationTokenRegistration> _cancellationByRequestId = new();
          private int _connectionState = 0;
          private int _writeInProgress = 0;
          private const int Closed = 1;