From caee47148f2928257645c43e312b4e6f40948e05 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 11 Jan 2017 14:02:34 +0100
Subject: [PATCH] comments: skip already deleted comments and make sure we
 don't raise unnecessary errors.

---
 rhodecode/controllers/changeset.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
index a6970082..c10a56f3 100644
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -428,6 +428,11 @@ class ChangesetController(BaseRepoController):
     @jsonify
     def delete_comment(self, repo_name, comment_id):
         comment = ChangesetComment.get(comment_id)
+        if not comment:
+            log.debug('Comment with id:%s not found, skipping', comment_id)
+            # comment already deleted in another call probably
+            return True
+
         owner = (comment.author.user_id == c.rhodecode_user.user_id)
         is_repo_admin = h.HasRepoPermissionAny('repository.admin')(c.repo_name)
         if h.HasPermissionAny('hg.admin')() or is_repo_admin or owner: