From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 16 Oct 2013 11:08:55 +0000 (+0200)
Subject: Fix Service::{Get,Set}ModifiedAttributes.
X-Git-Tag: v0.0.3~95
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ba06166201b0f4155bd0ce338e7f30015eb357d;p=icinga2

Fix Service::{Get,Set}ModifiedAttributes.
---

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 6878c836f..bece73696 100644
--- a/lib/icinga/service.cpp
+++ b/lib/icinga/service.cpp
@@ -343,7 +343,7 @@ int Service::GetModifiedAttributes(void) const
 	if (!m_OverrideEnablePassiveChecks.IsEmpty())
 		attrs |= ModAttrPassiveChecksEnabled;
 
-	if (!m_OverrideCheckInterval)
+	if (!m_OverrideCheckInterval.IsEmpty())
 		attrs |= ModAttrNormalCheckInterval;
 
 	if (!m_OverrideRetryInterval.IsEmpty())
@@ -361,6 +361,12 @@ void Service::SetModifiedAttributes(int flags)
 
 	if ((flags & ModAttrPassiveChecksEnabled) == 0)
 		m_OverrideEnablePassiveChecks = Empty;
+
+	if ((flags & ModAttrNormalCheckInterval) == 0)
+		m_OverrideCheckInterval = Empty;
+
+	if ((flags & ModAttrRetryCheckInterval) == 0)
+		m_OverrideRetryInterval = Empty;
 }
 
 bool Service::ResolveMacro(const String& macro, const Dictionary::Ptr& cr, String *result) const