From 77502423848edb28e91c3bf7d7fc3d4d87917520 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Tue, 12 Jun 2012 11:56:12 +0200
Subject: [PATCH] Bugfixes.

---
 base/exception.cpp      | 2 +-
 icinga-app/icinga2.conf | 4 ++--
 jsonrpc/messagepart.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/exception.cpp b/base/exception.cpp
index 00858c1f2..f0b609634 100644
--- 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 813ee55b1..877c2c743 100644
--- 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 72e8d2765..19d1d1c88 100644
--- 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);