From cefcde9ba9a4d951500ffb267134eaebaad6b928 Mon Sep 17 00:00:00 2001
From: DDuarte <dnpd.dd@gmail.com>
Date: Fri, 19 Sep 2014 03:30:02 +0100
Subject: Core/Misc: Multiple static analysis issues fixed (small optimizations
 and clear code)

---
 src/server/worldserver/Main.cpp                   | 3 +--
 src/server/worldserver/RemoteAccess/RASession.cpp | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/server/worldserver')

diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 191e44b3e93..07101e61eb6 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -268,8 +268,7 @@ extern int main(int argc, char** argv)
         delete soapThread;
     }
 
-    if (raAcceptor != nullptr)
-        delete raAcceptor;
+    delete raAcceptor;
 
     ///- Clean database before leaving
     ClearOnlineAccounts();
diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp
index 9892019ae5a..35149fff0b5 100644
--- a/src/server/worldserver/RemoteAccess/RASession.cpp
+++ b/src/server/worldserver/RemoteAccess/RASession.cpp
@@ -192,9 +192,7 @@ bool RASession::ProcessCommand(std::string& command)
     }
 
     // Obtain a new promise per command
-    if (_commandExecuting != nullptr)
-        delete _commandExecuting;
-
+    delete _commandExecuting;
     _commandExecuting = new std::promise<void>();
 
     CliCommandHolder* cmd = new CliCommandHolder(this, command.c_str(), &RASession::CommandPrint, &RASession::CommandFinished);
-- 
cgit v1.2.3