]> granicus.if.org Git - icinga2/commitdiff
Fix failed assertion in DB IDO
authorMichael Friedrich <michael.friedrich@netways.de>
Mon, 27 Apr 2015 08:59:53 +0000 (10:59 +0200)
committerMichael Friedrich <michael.friedrich@netways.de>
Mon, 27 Apr 2015 09:00:59 +0000 (11:00 +0200)
fixes #9121

lib/icinga/checkable.cpp

index c023ae42f90ac8526dc2c2dd63b35ff05ab55be0..bc1eab9960bfb6a1fa67e0d207ac5e233c20ca95 100644 (file)
@@ -95,8 +95,6 @@ void Checkable::AddGroup(const String& name)
 
 AcknowledgementType Checkable::GetAcknowledgement(void)
 {
-       ASSERT(OwnsLock());
-
        AcknowledgementType avalue = static_cast<AcknowledgementType>(GetAcknowledgementRaw());
 
        if (avalue != AcknowledgementNone) {
@@ -118,12 +116,8 @@ bool Checkable::IsAcknowledged(void)
 
 void Checkable::AcknowledgeProblem(const String& author, const String& comment, AcknowledgementType type, bool notify, double expiry, const MessageOrigin& origin)
 {
-       {
-               ObjectLock olock(this);
-
-               SetAcknowledgementRaw(type);
-               SetAcknowledgementExpiry(expiry);
-       }
+       SetAcknowledgementRaw(type);
+       SetAcknowledgementExpiry(expiry);
 
        if (notify)
                OnNotificationsRequested(this, NotificationAcknowledgement, GetLastCheckResult(), author, comment);
@@ -133,8 +127,6 @@ void Checkable::AcknowledgeProblem(const String& author, const String& comment,
 
 void Checkable::ClearAcknowledgement(const MessageOrigin& origin)
 {
-       ASSERT(OwnsLock());
-
        SetAcknowledgementRaw(AcknowledgementNone);
        SetAcknowledgementExpiry(0);