tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/vs2013-4987' into next 

Fixes #4987
This commit is contained in:
Gunnar Beutner 2013-11-01 00:14:18 +01:00
parent 7d501e0a20 fcc96cfe8f
commit b896ac1693
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/cluster/endpoint.cpp
View File

@ -41,7 +41,7 @@ boost::signals2::signal<void (const Endpoint::Ptr&, const Dictionary::Ptr&)> End
*/
bool Endpoint::IsConnected(void) const
{
return GetClient();
return GetClient() != NULL;
}
Stream::Ptr Endpoint::GetClient(void) const

2
lib/base/value.h
View File

@ -97,7 +97,7 @@ public:
if (!IsObject())
return false;
return (dynamic_pointer_cast<T>(boost::get<Object::Ptr>(m_Value)));
return (dynamic_pointer_cast<T>(boost::get<Object::Ptr>(m_Value)) != NULL);
}
static Value FromJson(cJSON *json);

2
lib/icinga/service-check.cpp
View File

@ -125,7 +125,7 @@ void Service::UpdateNextCheck(void)
bool Service::HasBeenChecked(void) const
{
return GetLastCheckResult();
return GetLastCheckResult() != NULL;
}
double Service::GetLastCheck(void) const