Skip to content

Commit 09f55e5

Browse files
committed
revert erroneous rebase changes
1 parent f3ca132 commit 09f55e5

File tree

5 files changed

+2
-16
lines changed

5 files changed

+2
-16
lines changed

src/cmap/connection_pool.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,6 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
388388
}
389389
} else {
390390
timeout = Timeout.expires(waitQueueTimeoutMS);
391-
clearTimeout = true;
392391
}
393392

394393
const waitQueueMember: WaitQueueMember = {

src/error.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -768,15 +768,6 @@ export class MongoOperationTimeoutError extends MongoRuntimeError {
768768
}
769769
}
770770

771-
/**
772-
* @internal
773-
*/
774-
export class MongoOperationTimeoutError extends MongoRuntimeError {
775-
override get name(): string {
776-
return 'MongoOperationTimeoutError';
777-
}
778-
}
779-
780771
/**
781772
* An error thrown when the user attempts to add options to a cursor that has already been
782773
* initialized

src/operations/find.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ export class FindOperation extends CommandOperation<Document> {
112112
...this.options,
113113
...this.bsonOptions,
114114
documentsReturnedIn: 'firstBatch',
115-
sessiontimeout: this.timeout
115+
session,
116+
timeout: this.timeout
116117
},
117118
undefined
118119
);

src/operations/operation.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ export abstract class AbstractOperation<TResult = any> {
6767
/** @internal */
6868
timeoutMS?: number;
6969

70-
/** @internal */
71-
serverSelectionTimeout?: Timeout;
72-
7370
[kSession]: ClientSession | undefined;
7471

7572
constructor(options: OperationOptions = {}) {

src/sdam/topology.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,6 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
565565
}
566566
const serverSelectionTimeoutMS = options.serverSelectionTimeoutMS ?? 0;
567567
let timeout: Timeout | null;
568-
569568
if (options.timeout) {
570569
// CSOT Enabled
571570
if (options.timeout.duration > 0 || serverSelectionTimeoutMS > 0) {
@@ -582,7 +581,6 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
582581
}
583582
} else {
584583
timeout = Timeout.expires(serverSelectionTimeoutMS);
585-
clearTimeout = true;
586584
}
587585

588586
const isSharded = this.description.type === TopologyType.Sharded;

0 commit comments

Comments
 (0)