tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failed assertion in DB IDO 

fixes #9121
This commit is contained in:
Michael Friedrich 2015-04-27 10:59:53 +02:00
parent 7af41e93c0
commit e37cd25ed4
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/icinga/checkable.cpp
View File

@ -102,8 +102,6 @@ void Checkable::AddGroup(const String& name)
AcknowledgementType Checkable::GetAcknowledgement(void) AcknowledgementType Checkable::GetAcknowledgement(void)
{ {
ASSERT(OwnsLock());
AcknowledgementType avalue = static_cast<AcknowledgementType>(GetAcknowledgementRaw()); AcknowledgementType avalue = static_cast<AcknowledgementType>(GetAcknowledgementRaw());
if (avalue != AcknowledgementNone) { if (avalue != AcknowledgementNone) {
@ -125,12 +123,8 @@ bool Checkable::IsAcknowledged(void)
void Checkable::AcknowledgeProblem(const String& author, const String& comment, AcknowledgementType type, bool notify, double expiry, const MessageOrigin& origin) void Checkable::AcknowledgeProblem(const String& author, const String& comment, AcknowledgementType type, bool notify, double expiry, const MessageOrigin& origin)
{ {
{ SetAcknowledgementRaw(type);
ObjectLock olock(this); SetAcknowledgementExpiry(expiry);
SetAcknowledgementRaw(type);
SetAcknowledgementExpiry(expiry);
}
if (notify) if (notify)
OnNotificationsRequested(this, NotificationAcknowledgement, GetLastCheckResult(), author, comment); OnNotificationsRequested(this, NotificationAcknowledgement, GetLastCheckResult(), author, comment);
@ -140,8 +134,6 @@ void Checkable::AcknowledgeProblem(const String& author, const String& comment,
void Checkable::ClearAcknowledgement(const MessageOrigin& origin) void Checkable::ClearAcknowledgement(const MessageOrigin& origin)
{ {
ASSERT(OwnsLock());
SetAcknowledgementRaw(AcknowledgementNone); SetAcknowledgementRaw(AcknowledgementNone);
SetAcknowledgementExpiry(0); SetAcknowledgementExpiry(0);