From c4a8afbe5f2280521b1415c58b1d711140ac4914 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Fri, 15 May 2020 12:02:51 +0200
Subject: [PATCH] Icinga DB: record ack expiries

refs #8012
---
 lib/icinga/checkable.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/lib/icinga/checkable.cpp b/lib/icinga/checkable.cpp
index 75e23c03d..0f4d1399b 100644
--- a/lib/icinga/checkable.cpp
+++ b/lib/icinga/checkable.cpp
@@ -143,15 +143,7 @@ void Checkable::ClearAcknowledgement(const String& removedBy, double changeTime,
 {
 	ObjectLock oLock (this);
 
-	bool wasAcked;
-
-	if (GetAcknowledgementRaw() == AcknowledgementNone) {
-		wasAcked = false;
-	} else {
-		double expiry = GetAcknowledgementExpiry();
-
-		wasAcked = expiry == 0 || expiry >= Utility::GetTime();
-	}
+	bool wasAcked = GetAcknowledgementRaw() != AcknowledgementNone;
 
 	SetAcknowledgementRaw(AcknowledgementNone);
 	SetAcknowledgementExpiry(0);