Fix Service::{Get,Set}ModifiedAttributes.

diff --git a/lib/icinga/service.cpp b/lib/icinga/service.cpp
index 6878c836fa790ae73664f2d7be8f17b7bb115aa6..bece736967f6e6504970abef5c28393b96fa899a 100644 (file)
--- 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