From: Michael Friedrich <michael.friedrich@netways.de>
Date: Fri, 18 Dec 2015 09:52:04 +0000 (+0100)
Subject: Fix crash in DbEvents::RemoveCommentInternal()
X-Git-Tag: v2.5.0~642
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c8fdf06cfee0a54b9265b799d2786d1a5c14993;p=icinga2

Fix crash in DbEvents::RemoveCommentInternal()

Missing multiple queries as implemented with RemoveDowntimeInternal().

fixes #10883
---

diff --git a/lib/db_ido/dbevents.cpp b/lib/db_ido/dbevents.cpp
index 9679bc2fe..82fe32a0d 100644
--- a/lib/db_ido/dbevents.cpp
+++ b/lib/db_ido/dbevents.cpp
@@ -411,7 +411,7 @@ void DbEvents::RemoveCommentInternal(std::vector<DbQuery>& queries, const Commen
 	query1.WhereCriteria = new Dictionary();
 	query1.WhereCriteria->Set("object_id", checkable);
 	query1.WhereCriteria->Set("internal_comment_id", comment->GetLegacyId());
-	DbObject::OnQuery(query1);
+	queries.push_back(query1);
 
 	/* History - update deletion time for service/host */
 	unsigned long entry_time = static_cast<long>(comment->GetEntryTime());
@@ -434,8 +434,7 @@ void DbEvents::RemoveCommentInternal(std::vector<DbQuery>& queries, const Commen
 	query2.WhereCriteria->Set("object_id", checkable);
 	query2.WhereCriteria->Set("comment_time", DbValue::FromTimestamp(entry_time));
 	query2.WhereCriteria->Set("instance_id", 0); /* DbConnection class fills in real ID */
-
-	DbObject::OnQuery(query2);
+	queries.push_back(query2);
 }
 
 /* downtimes */