From 6a4f7dcf25d93e334471be1ded752a5f7ba00fb5 Mon Sep 17 00:00:00 2001
From: Johannes Schanda <schanda@itestra.de>
Date: Wed, 15 May 2013 15:29:44 +0200
Subject: Fix test on object path registration

---
 src/CommonAPI/DBus/DBusObjectManager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/CommonAPI/DBus/DBusObjectManager.cpp b/src/CommonAPI/DBus/DBusObjectManager.cpp
index fcfa9f8..3c3c122 100644
--- a/src/CommonAPI/DBus/DBusObjectManager.cpp
+++ b/src/CommonAPI/DBus/DBusObjectManager.cpp
@@ -20,10 +20,10 @@ namespace DBus {
 DBusObjectManager::DBusObjectManager(const std::shared_ptr<DBusProxyConnection>& dbusConnection):
         dbusConnection_(dbusConnection) {
 
-    assert(!dbusConnection->isObjectPathMessageHandlerSet());
-    dbusConnection->setObjectPathMessageHandler(
-                    std::bind(&DBusObjectManager::handleMessage, this, std::placeholders::_1));
-
+    if (!dbusConnection->isObjectPathMessageHandlerSet()) {
+        dbusConnection->setObjectPathMessageHandler(
+                        std::bind(&DBusObjectManager::handleMessage, this, std::placeholders::_1));
+    }
     dbusConnection->registerObjectPath("/");
 }
 
-- 
cgit v1.2.1