Bugfixes.

diff --git a/base/exception.cpp b/base/exception.cpp
index 00858c1f23d2b4160b999a3500080a63a138afdf..f0b609634501081ee6e3b09d434a6c0c88c43b4a 100644 (file)
--- a/base/exception.cpp
+++ b/base/exception.cpp
@@ -58,7 +58,7 @@ string Exception::GetMessage(void) const
  */
 const char *Exception::what(void) const throw()
 {
-       return GetMessage().c_str();
+       return m_Message.c_str();
 }
 
 /**

diff --git a/icinga-app/icinga2.conf b/icinga-app/icinga2.conf
index 813ee55b13bf757ef1aa3bcad01489a6defa095a..877c2c7437068e1ea30aa5555027a140d80cc92d 100644 (file)
--- a/icinga-app/icinga2.conf
+++ b/icinga-app/icinga2.conf
@@ -3,7 +3,7 @@ local object application "icinga" {
        pubkey = "icinga-c2.crt",
 
        cakey = "ca.crt",
-       node = "10.0.10.3",
+       node = "192.168.2.235",
        service = 8888
 }
 
@@ -18,7 +18,7 @@ local object component "discovery" {
 }
 
 local object endpoint "icinga-c1" {
-       node = "10.0.10.14",
+       node = "192.168.5.46",
        service = 7777,
 
        roles = { "broker" }

diff --git a/jsonrpc/messagepart.cpp b/jsonrpc/messagepart.cpp
index 72e8d2765e1e9b4c3b7d2505322e82dabbfd9676..19d1d1c888d9b354ca423c85cb570e61992c2cac 100644 (file)
--- a/jsonrpc/messagepart.cpp
+++ b/jsonrpc/messagepart.cpp
@@ -179,7 +179,7 @@ Dictionary::Ptr MessagePart::GetDictionary(void) const
 bool MessagePart::GetProperty(string key, MessagePart *value) const
 {
        Object::Ptr object;
-       if (GetDictionary()->GetProperty(key, &object))
+       if (!GetDictionary()->GetProperty(key, &object))
                return false;
 
        Dictionary::Ptr dictionary = dynamic_pointer_cast<Dictionary>(object);