fixup! Use mongoutil.TimeoutWithinContext over validChangeStreamTimeouts for change streams

Author: prestonvasquez

mongo/change_stream.go

@@ -686,10 +686,15 @@ func (cs *ChangeStream) loopNext(ctx context.Context, nonBlocking bool) {
 	// operation-level timeout via contexts to a constructor and then that timeout
 	// later be applied while working with a resulting cursor. Instead, it is more
 	// idiomatic to apply the timeout to the context passed to Next or TryNext.
-	if cs.options != nil && !nonBlocking && !mongoutil.TimeoutWithinContext(ctx, cs.options.MaxAwaitTime) {
-		cs.err = fmt.Errorf("MaxAwaitTime must be less than the operation timeout")
+	if cs.options != nil && !nonBlocking {
+		maxAwaitTime := cs.cursorOptions.MaxAwaitTime
 
-		return
+		// If maxAwaitTime is not set, this check is unnecessary.
+		if maxAwaitTime != nil && !mongoutil.TimeoutWithinContext(ctx, *maxAwaitTime) {
+			cs.err = fmt.Errorf("MaxAwaitTime must be less than the operation timeout")
+
+			return
+		}
 	}
 
 	// Apply the client-level timeout if the operation-level timeout is not set.