From 3ba06166201b0f4155bd0ce338e7f30015eb357d Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Wed, 16 Oct 2013 13:08:55 +0200 Subject: [PATCH] Fix Service::{Get,Set}ModifiedAttributes. --- lib/icinga/service.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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