From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 3 Apr 2012 16:10:16 +0000 (+0200)
Subject: Cleaned up (Un)RegisterMethod methods.
X-Git-Tag: v0.0.1~647^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cac3c2109afe3656c871dd197e1e98ef536ce350;p=icinga2

Cleaned up (Un)RegisterMethod methods.
---

diff --git a/jsonrpc/connectionmanager.cpp b/jsonrpc/connectionmanager.cpp
index 681d5fb0b..c4a8566f3 100644
--- a/jsonrpc/connectionmanager.cpp
+++ b/jsonrpc/connectionmanager.cpp
@@ -66,25 +66,17 @@ int ConnectionManager::NewMessageHandler(NewMessageEventArgs::Ptr nmea)
 
 void ConnectionManager::RegisterMethod(string method, function<int (NewMessageEventArgs::Ptr)> callback)
 {
-	map<string, event<NewMessageEventArgs::Ptr> >::iterator i;
-	i = m_Methods.find(method);
-
-	if (i == m_Methods.end()) {
-		m_Methods[method] = event<NewMessageEventArgs::Ptr>();
-		i = m_Methods.find(method);
-	}
-
-	i->second += callback;
+	m_Methods[method] += callback;
 }
 
-void ConnectionManager::UnregisterMethod(string method, function<int (NewMessageEventArgs::Ptr)> function)
+void ConnectionManager::UnregisterMethod(string method, function<int (NewMessageEventArgs::Ptr)> callback)
 {
-	// TODO: implement
+	m_Methods[method] -= callback;
 }
 
 void ConnectionManager::SendMessage(JsonRpcMessage::Ptr message)
 {
-	/* TODO: filter messages based on event subscriptions */
+	/* TODO: filter messages based on event subscriptions; also loopback message to our own handlers */
 	for (list<JsonRpcClient::Ptr>::iterator i = m_Clients.begin(); i != m_Clients.end(); i++)
 	{
 		JsonRpcClient::Ptr client = *i;
diff --git a/jsonrpc/connectionmanager.h b/jsonrpc/connectionmanager.h
index 72a4563b2..62b049be1 100644
--- a/jsonrpc/connectionmanager.h
+++ b/jsonrpc/connectionmanager.h
@@ -24,8 +24,8 @@ public:
 	void RegisterClient(JsonRpcClient::Ptr client);
 	void UnregisterClient(JsonRpcClient::Ptr client);
 
-	void RegisterMethod(string method, function<int (NewMessageEventArgs::Ptr)> function);
-	void UnregisterMethod(string method, function<int (NewMessageEventArgs::Ptr)> function);
+	void RegisterMethod(string method, function<int (NewMessageEventArgs::Ptr)> callback);
+	void UnregisterMethod(string method, function<int (NewMessageEventArgs::Ptr)> callback);
 
 	void SendMessage(JsonRpcMessage::Ptr message);
 };