Skip to content

Commit cf77a9b

Browse files
mbroadstdaprahamian
authored andcommitted
refactor: simplify error handling checks
1 parent 93834b7 commit cf77a9b

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

lib/core/sdam/server.js

+20-20
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,14 @@ class Server extends EventEmitter {
240240
}
241241

242242
wireProtocol.command(this, ns, cmd, options, (err, result) => {
243-
if (err && err instanceof MongoNetworkError) {
244-
if (options.session) {
243+
if (err) {
244+
if (options.session && err instanceof MongoNetworkError) {
245245
options.session.serverSession.isDirty = true;
246246
}
247-
}
248247

249-
if (err && isSDAMUnrecoverableError(err)) {
250-
this.emit('error', err);
248+
if (isSDAMUnrecoverableError(err)) {
249+
this.emit('error', err);
250+
}
251251
}
252252

253253
callback(err, result);
@@ -264,14 +264,14 @@ class Server extends EventEmitter {
264264
*/
265265
query(ns, cmd, cursorState, options, callback) {
266266
wireProtocol.query(this, ns, cmd, cursorState, options, (err, result) => {
267-
if (err && err instanceof MongoNetworkError) {
268-
if (options.session) {
267+
if (err) {
268+
if (options.session && err instanceof MongoNetworkError) {
269269
options.session.serverSession.isDirty = true;
270270
}
271-
}
272271

273-
if (err && isSDAMUnrecoverableError(err)) {
274-
this.emit('error', err);
272+
if (isSDAMUnrecoverableError(err)) {
273+
this.emit('error', err);
274+
}
275275
}
276276

277277
callback(err, result);
@@ -288,14 +288,14 @@ class Server extends EventEmitter {
288288
*/
289289
getMore(ns, cursorState, batchSize, options, callback) {
290290
wireProtocol.getMore(this, ns, cursorState, batchSize, options, (err, result) => {
291-
if (err && err instanceof MongoNetworkError) {
292-
if (options.session) {
291+
if (err) {
292+
if (options.session && err instanceof MongoNetworkError) {
293293
options.session.serverSession.isDirty = true;
294294
}
295-
}
296295

297-
if (err && isSDAMUnrecoverableError(err)) {
298-
this.emit('error', err);
296+
if (isSDAMUnrecoverableError(err)) {
297+
this.emit('error', err);
298+
}
299299
}
300300

301301
callback(err, result);
@@ -424,14 +424,14 @@ function executeWriteOperation(args, options, callback) {
424424
}
425425

426426
return wireProtocol[op](server, ns, ops, options, (err, result) => {
427-
if (err && err instanceof MongoNetworkError) {
428-
if (options.session) {
427+
if (err) {
428+
if (options.session && err instanceof MongoNetworkError) {
429429
options.session.serverSession.isDirty = true;
430430
}
431-
}
432431

433-
if (err && isSDAMUnrecoverableError(err)) {
434-
server.emit('error', err);
432+
if (isSDAMUnrecoverableError(err)) {
433+
server.emit('error', err);
434+
}
435435
}
436436

437437
callback(err, result);

0 commit comments

Comments
 (0)