Request- und RequestHandler-Interfaces vereinfacht

1 files changed, 5 insertions, 5 deletions

diff --git a/src/Common/RequestHandlers/DisconnectRequestHandler.cpp b/src/Common/RequestHandlers/DisconnectRequestHandler.cpp
index 346b6de..031853a 100644
--- a/src/Common/RequestHandlers/DisconnectRequestHandler.cpp
+++ b/src/Common/RequestHandlers/DisconnectRequestHandler.cpp
@@ -20,14 +20,13 @@
 #include "DisconnectRequestHandler.h"
 #include "../Exception.h"
 #include "../Logger.h"
-#include "../XmlPacket.h"
 #include <Net/Connection.h>
 
 namespace Mad {
 namespace Common {
 namespace RequestHandlers {
 
-void DisconnectRequestHandler::handlePacket(Net::Connection *connection, uint16_t requestId, const XmlPacket &packet) {
+void DisconnectRequestHandler::handlePacket(const XmlPacket &packet) {
   if(packet.getType() != "Disconnect") {
     Logger::log(Logger::ERROR, "Received an unexpected packet.");
 
@@ -35,7 +34,7 @@ void DisconnectRequestHandler::handlePacket(Net::Connection *connection, uint16_
     ret.setType("Error");
     ret.add("ErrorCode", Exception::UNEXPECTED_PACKET);
 
-    connection->send(ret.encode(requestId));
+    sendPacket(ret);
 
     signalFinished().emit();
     return;
@@ -44,9 +43,10 @@ void DisconnectRequestHandler::handlePacket(Net::Connection *connection, uint16_
   XmlPacket ret;
   ret.setType("OK");
 
-  connection->send(ret.encode(requestId));
+  sendPacket(ret);
 
-  connection->disconnect();
+
+  getConnection()->disconnect();
 
   signalFinished().emit();
 }