From 584e35e4ab1e4fb8d28d71533bbee3b9da84a2cd Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 16 Nov 2015 10:58:11 -0800
Subject: [PATCH] have killNodeWithUUID return success to avoid double lookup

---
 domain-server/src/DomainServer.cpp           | 4 +---
 libraries/networking/src/LimitedNodeList.cpp | 5 ++++-
 libraries/networking/src/LimitedNodeList.h   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 790548c5b3..127c121cf3 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1836,9 +1836,7 @@ void DomainServer::processNodeDisconnectRequestPacket(QSharedPointer<NLPacket> p
     
     qDebug() << "Received a disconnect request from node with UUID" << nodeUUID;
     
-    if (limitedNodeList->nodeWithUUID(nodeUUID)) {
-        limitedNodeList->killNodeWithUUID(nodeUUID);
-        
+    if (limitedNodeList->killNodeWithUUID(nodeUUID)) {        
         static auto removedNodePacket = NLPacket::create(PacketType::DomainServerRemovedNode, NUM_BYTES_RFC4122_UUID);
         
         removedNodePacket->reset();
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index 75d42f55cb..fdb5049f00 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -441,7 +441,7 @@ void LimitedNodeList::reset() {
     _nodeSocket.clearConnections();
 }
 
-void LimitedNodeList::killNodeWithUUID(const QUuid& nodeUUID) {
+bool LimitedNodeList::killNodeWithUUID(const QUuid& nodeUUID) {
     QReadLocker readLocker(&_nodeMutex);
 
     NodeHash::iterator it = _nodeHash.find(nodeUUID);
@@ -456,7 +456,10 @@ void LimitedNodeList::killNodeWithUUID(const QUuid& nodeUUID) {
         }
         
         handleNodeKill(matchingNode);
+        return true;
     }
+    
+    return false;
 }
 
 void LimitedNodeList::processKillNode(NLPacket& packet) {
diff --git a/libraries/networking/src/LimitedNodeList.h b/libraries/networking/src/LimitedNodeList.h
index 2488b0cf8c..1aacd27572 100644
--- a/libraries/networking/src/LimitedNodeList.h
+++ b/libraries/networking/src/LimitedNodeList.h
@@ -230,7 +230,7 @@ public slots:
     virtual void sendSTUNRequest();
     void sendPingPackets();
 
-    void killNodeWithUUID(const QUuid& nodeUUID);
+    bool killNodeWithUUID(const QUuid& nodeUUID);
 
 signals:
     void dataSent(quint8 channelType, int bytes);