fix rebase

joao-r-reis · joao-r-reis · commit 5ed9c208334a · 2024-09-20T11:31:10.000+01:00
diff --git a/src/Cassandra/Requests/ReprepareHandler.cs b/src/Cassandra/Requests/ReprepareHandler.cs
@@ -113,11 +113,11 @@ public async Task ReprepareOnSingleNodeAsync(
             SemaphoreSlim sem,
             bool throwException)
         {
-            HostTrackingInfo? hostInfo = null;
+            HostTrackingInfo hostInfo = null;
             if (observer != null)
             {
                 hostInfo = new HostTrackingInfo(poolKvp.Key, Guid.NewGuid());
-                await observer.OnNodeStartAsync(requestTrackingInfo, hostInfo.Value).ConfigureAwait(false);
+                await observer.OnNodeStartAsync(requestTrackingInfo, hostInfo).ConfigureAwait(false);
             }
 
             try
@@ -130,7 +130,7 @@ public async Task ReprepareOnSingleNodeAsync(
                     await connection.Send(request).ConfigureAwait(false);
                     if (observer != null)
                     {
-                        await observer.OnNodeSuccessAsync(requestTrackingInfo, hostInfo.Value).ConfigureAwait(false);
+                        await observer.OnNodeSuccessAsync(requestTrackingInfo, hostInfo).ConfigureAwait(false);
                     }
                     return;
                 }
@@ -148,7 +148,7 @@ public async Task ReprepareOnSingleNodeAsync(
                         await observer.OnNodeRequestErrorAsync(
                             RequestError.CreateServerError(ex),
                             requestTrackingInfo,
-                            hostInfo.Value).ConfigureAwait(false);
+                            hostInfo).ConfigureAwait(false);
                     }
                     return;
                 }
@@ -163,7 +163,7 @@ await observer.OnNodeRequestErrorAsync(
                     await observer.OnNodeRequestErrorAsync(
                         RequestError.CreateClientError(new DriverInternalError($"Could not obtain an existing connection to prepare query on {poolKvp.Key}."), false),
                         requestTrackingInfo,
-                        hostInfo.Value).ConfigureAwait(false);
+                        hostInfo).ConfigureAwait(false);
                 }
             }
             catch (Exception ex)
@@ -173,7 +173,7 @@ await observer.OnNodeRequestErrorAsync(
                     await observer.OnNodeRequestErrorAsync(
                         RequestError.CreateServerError(ex), 
                         requestTrackingInfo, 
-                        hostInfo.Value).ConfigureAwait(false);
+                        hostInfo).ConfigureAwait(false);
                 }
                 LogOrThrow(
                     throwException,

Original file line number	Diff line number	Diff line change
`@@ -113,11 +113,11 @@ public async Task ReprepareOnSingleNodeAsync(`
`113`	`113`	`SemaphoreSlim sem,`
`114`	`114`	`bool throwException)`
`115`	`115`	`{`
`116`		`- HostTrackingInfo? hostInfo = null;`
	`116`	`+ HostTrackingInfo hostInfo = null;`
`117`	`117`	`if (observer != null)`
`118`	`118`	`{`
`119`	`119`	`hostInfo = new HostTrackingInfo(poolKvp.Key, Guid.NewGuid());`
`120`		`- await observer.OnNodeStartAsync(requestTrackingInfo, hostInfo.Value).ConfigureAwait(false);`
	`120`	`+ await observer.OnNodeStartAsync(requestTrackingInfo, hostInfo).ConfigureAwait(false);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`try`
`@@ -130,7 +130,7 @@ public async Task ReprepareOnSingleNodeAsync(`
`130`	`130`	`await connection.Send(request).ConfigureAwait(false);`
`131`	`131`	`if (observer != null)`
`132`	`132`	`{`
`133`		`- await observer.OnNodeSuccessAsync(requestTrackingInfo, hostInfo.Value).ConfigureAwait(false);`
	`133`	`+ await observer.OnNodeSuccessAsync(requestTrackingInfo, hostInfo).ConfigureAwait(false);`
`134`	`134`	`}`
`135`	`135`	`return;`
`136`	`136`	`}`
`@@ -148,7 +148,7 @@ public async Task ReprepareOnSingleNodeAsync(`
`148`	`148`	`await observer.OnNodeRequestErrorAsync(`
`149`	`149`	`RequestError.CreateServerError(ex),`
`150`	`150`	`requestTrackingInfo,`
`151`		`- hostInfo.Value).ConfigureAwait(false);`
	`151`	`+ hostInfo).ConfigureAwait(false);`
`152`	`152`	`}`
`153`	`153`	`return;`
`154`	`154`	`}`
`@@ -163,7 +163,7 @@ await observer.OnNodeRequestErrorAsync(`
`163`	`163`	`await observer.OnNodeRequestErrorAsync(`
`164`	`164`	`RequestError.CreateClientError(new DriverInternalError($"Could not obtain an existing connection to prepare query on {poolKvp.Key}."), false),`
`165`	`165`	`requestTrackingInfo,`
`166`		`- hostInfo.Value).ConfigureAwait(false);`
	`166`	`+ hostInfo).ConfigureAwait(false);`
`167`	`167`	`}`
`168`	`168`	`}`
`169`	`169`	`catch (Exception ex)`
`@@ -173,7 +173,7 @@ await observer.OnNodeRequestErrorAsync(`
`173`	`173`	`await observer.OnNodeRequestErrorAsync(`
`174`	`174`	`RequestError.CreateServerError(ex),`
`175`	`175`	`requestTrackingInfo,`
`176`		`- hostInfo.Value).ConfigureAwait(false);`
	`176`	`+ hostInfo).ConfigureAwait(false);`
`177`	`177`	`}`
`178`	`178`	`LogOrThrow(`
`179`	`179`	`throwException,`