diff options
| author | zeripath <art27@cantab.net> | 2019-01-14 02:29:58 +0000 |
|---|---|---|
| committer | techknowlogick <hello@techknowlogick.com> | 2019-01-13 21:29:58 -0500 |
| commit | 6868378673f5bb21eac54719d719557b32448db6 (patch) | |
| tree | 561ad952fa24332823d1288b1ff364206f1e4caf /models/issue_comment.go | |
| parent | 656456441ca09de27ffb44d7a8042db811ff989e (diff) | |
| download | gitea-6868378673f5bb21eac54719d719557b32448db6.tar.gz gitea-6868378673f5bb21eac54719d719557b32448db6.zip | |
Ensure that sessions are passed into queries that could use the database to prevent deadlocks (#5718)
* Fixed deadlock in CreateComment
* Fix possible deadlock in UpdateIssueDeadline from createDeadlineComment
* Ensure that calls to IsTimeTracker enabled are called within session
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Ensure that calls to reactionList are also called within session
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Ensure all calls in NewPullRequest with the session are called within the session
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Deal with potential deadlocks in repo
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Ensure that isStaring is checked within our transaction
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix mistake in isOrganizationMember
Sorry.
Diffstat (limited to 'models/issue_comment.go')
| -rw-r--r-- | models/issue_comment.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/models/issue_comment.go b/models/issue_comment.go index 03096414ee..0e40e442b6 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -559,7 +559,7 @@ func sendCreateCommentAction(e *xorm.Session, opts *CreateCommentOptions, commen case CommentTypeCode: if comment.ReviewID != 0 { if comment.Review == nil { - if err := comment.LoadReview(); err != nil { + if err := comment.loadReview(e); err != nil { return err } } @@ -709,7 +709,7 @@ func createDeadlineComment(e *xorm.Session, doer *User, issue *Issue, newDeadlin content = newDeadlineUnix.Format("2006-01-02") + "|" + issue.DeadlineUnix.Format("2006-01-02") } - if err := issue.LoadRepo(); err != nil { + if err := issue.loadRepo(e); err != nil { return nil, err } |