Skip to content

Commit 0458064

Browse files
committed
Revert Database.runTransaction runner ordering
1 parent 9b0a458 commit 0458064

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

src/database.ts

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3253,26 +3253,20 @@ class Database extends common.GrpcServiceObject {
32533253
options
32543254
);
32553255

3256-
runner
3257-
.run()
3258-
.then(release, err => {
3259-
setSpanError(span, err);
3256+
runner.run().then(release, err => {
3257+
setSpanError(span, err!);
32603258

3261-
if (isSessionNotFoundError(err)) {
3262-
span.addEvent('No session available', {
3263-
'session.id': session?.id,
3264-
});
3265-
release();
3266-
this.runTransaction(options, runFn!);
3267-
} else {
3268-
release();
3269-
setImmediate(runFn!, err);
3270-
}
3271-
})
3272-
.catch(e => {
3273-
setSpanErrorAndException(span, e as Error);
3274-
throw e;
3275-
});
3259+
if (isSessionNotFoundError(err)) {
3260+
span.addEvent('No session available', {
3261+
'session.id': session?.id,
3262+
});
3263+
release();
3264+
this.runTransaction(options, runFn!);
3265+
} else {
3266+
setImmediate(runFn!, err);
3267+
release();
3268+
}
3269+
});
32763270
});
32773271
});
32783272
}

0 commit comments

Comments
 (0)