pr

Author: Oleksandr Poliakov

src/MongoDB.Driver/Core/Misc/Ensure.cs

@@ -460,12 +460,11 @@ public static string IsNullOrNotEmpty(string value, string paramName)
         /// <returns>The value of the parameter.</returns>
         public static TimeSpan IsValidTimeout(TimeSpan value, string paramName)
         {
-            if (value > TimeSpan.Zero || value == Timeout.InfiniteTimeSpan)
+            if (value < TimeSpan.Zero && value != Timeout.InfiniteTimeSpan)
             {
-                return value;
+                throw new ArgumentOutOfRangeException($"Invalid timeout: {value}.", paramName);
             }
-
-            throw new ArgumentOutOfRangeException($"Invalid timeout: {value}.", paramName);
+            return value;
         }
 
         /// <summary>

src/MongoDB.Driver/Core/WireProtocol/CommandUsingCommandMessageWireProtocol.cs

@@ -380,6 +380,10 @@ private Type0CommandMessageSection<BsonDocument> CreateType0Section(OperationCon
                 if (serverTimeout != Timeout.InfiniteTimeSpan)
                 {
                     serverTimeout -= _roundTripTime;
+                    if (serverTimeout < TimeSpan.Zero)
+                    {
+                        throw new TimeoutException();
+                    }
 
                     var serverTimeoutMs = MaxTimeHelper.ToMaxTimeMS(serverTimeout);
                     AddIfNotAlreadyAdded("maxTimeMS", serverTimeoutMs);

src/MongoDB.Driver/ClientSessionExtensions.cs renamed to src/MongoDB.Driver/IClientSessionExtensions.cs

@@ -15,7 +15,7 @@
 
 namespace MongoDB.Driver;
 
-internal static class ClientSessionExtensions
+internal static class IClientSessionExtensions
 {
     public static ReadPreference GetEffectiveReadPreference(this IClientSession session, ReadPreference defaultReadPreference)
     {