1 files changed, 7 insertions, 10 deletions

diff --git a/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp b/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp
index 35daae4..66c3aa1 100644
--- a/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp
+++ b/src/Core/RequestHandlers/DaemonStatusRequestHandler.cpp
@@ -27,7 +27,7 @@ namespace Mad {
 namespace Core {
 namespace RequestHandlers {
 
-void DaemonStatusRequestHandler::handlePacket(Net::Connection *connection, uint16_t requestId, const Common::XmlPacket &packet) {
+void DaemonStatusRequestHandler::handlePacket(const Common::XmlPacket &packet) {
   if(packet.getType() != "GetDaemonStatus") {
     Common::Logger::log(Common::Logger::ERROR, "Received an unexpected packet.");
 
@@ -35,7 +35,7 @@ void DaemonStatusRequestHandler::handlePacket(Net::Connection *connection, uint1
     ret.setType("Error");
     ret.add("ErrorCode", Common::Exception::UNEXPECTED_PACKET);
 
-    con->send(ret.encode(requestId));
+    sendPacket(ret);
 
     signalFinished().emit();
     return;
@@ -43,14 +43,12 @@ void DaemonStatusRequestHandler::handlePacket(Net::Connection *connection, uint1
 
   // TODO Require authentication
 
-  con = connection;
-  rid = requestId;
-
   std::string daemonName = packet["daemonName"];
 
   try {
     Net::Connection *daemonCon = ConnectionManager::get()->getDaemonConnection(daemonName);
-    Common::RequestManager::get()->sendRequest(daemonCon, std::auto_ptr<Common::Request>(new Common::Requests::StatusRequest(sigc::mem_fun(this, &DaemonStatusRequestHandler::requestFinished))));
+    Common::RequestManager::get()->sendRequest<Common::Requests::StatusRequest>(daemonCon,
+        sigc::mem_fun(this, &DaemonStatusRequestHandler::requestFinished));
   }
   catch(Common::Exception &e) {
     Common::XmlPacket ret;
@@ -60,14 +58,13 @@ void DaemonStatusRequestHandler::handlePacket(Net::Connection *connection, uint1
     ret.add("SubSubCode", e.getSubSubCode());
     ret.add("Where", e.getWhere());
 
-    con->send(ret.encode(rid));
+    sendPacket(ret);
   }
 }
 
 void DaemonStatusRequestHandler::requestFinished(const Common::Request &request) {
   try {
-    const Common::XmlPacket &packet = request.getResult();
-    con->send(packet.encode(rid));
+    sendPacket(request.getResult());
   }
   catch(Common::Exception &e) {
     Common::XmlPacket ret;
@@ -77,7 +74,7 @@ void DaemonStatusRequestHandler::requestFinished(const Common::Request &request)
     ret.add("SubSubCode", e.getSubSubCode());
     ret.add("Where", e.getWhere());
 
-    con->send(ret.encode(rid));
+    sendPacket(ret);
   }
 
   signalFinished().emit();