From 1e1f199fdb2dbefbb9d9f90588656db44abad8bb Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 1 Jul 2015 14:54:26 -0700
Subject: [PATCH] Undoing unwisdom

---
 .../networking/src/ReceivedPacketProcessor.cpp      | 13 +++++++------
 libraries/networking/src/ReceivedPacketProcessor.h  |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/networking/src/ReceivedPacketProcessor.cpp b/libraries/networking/src/ReceivedPacketProcessor.cpp
index 0d8494d712..706266a903 100644
--- a/libraries/networking/src/ReceivedPacketProcessor.cpp
+++ b/libraries/networking/src/ReceivedPacketProcessor.cpp
@@ -23,7 +23,7 @@ void ReceivedPacketProcessor::queueReceivedPacket(const SharedNodePointer& sendi
 
     NetworkPacket networkPacket(sendingNode, packet);
     lock();
-    _queuedPackets.push_back(networkPacket);
+    _packets.push_back(networkPacket);
     _nodePacketCounts[sendingNode->getUUID()]++;
     unlock();
     
@@ -33,28 +33,29 @@ void ReceivedPacketProcessor::queueReceivedPacket(const SharedNodePointer& sendi
 
 bool ReceivedPacketProcessor::process() {
 
-    if (_queuedPackets.size() == 0) {
+    if (_packets.size() == 0) {
         _waitingOnPacketsMutex.lock();
         _hasPackets.wait(&_waitingOnPacketsMutex, getMaxWait());
         _waitingOnPacketsMutex.unlock();
     }
 
     preProcess();
-    if (!_queuedPackets.size()) {
+    QVector<NetworkPacket> currentPackets;
+    if (!_packets.size()) {
         return isStillRunning();
     }
 
     lock();
-    _processingPackets.swap(_queuedPackets);
+    std::swap(currentPackets, _packets);
     unlock();
 
-    foreach(auto& packet, _processingPackets) {
+    foreach(auto& packet, currentPackets) {
         processPacket(packet.getNode(), packet.getByteArray()); 
         midProcess();
     }
 
     lock();
-    foreach(auto& packet, _processingPackets) {
+    foreach(auto& packet, currentPackets) {
         _nodePacketCounts[packet.getNode()->getUUID()]--;
     }
     unlock();
diff --git a/libraries/networking/src/ReceivedPacketProcessor.h b/libraries/networking/src/ReceivedPacketProcessor.h
index 1a621e505a..bcc9f9a1f5 100644
--- a/libraries/networking/src/ReceivedPacketProcessor.h
+++ b/libraries/networking/src/ReceivedPacketProcessor.h
@@ -75,8 +75,7 @@ protected:
 
 protected:
 
-    QVector<NetworkPacket> _queuedPackets;
-    QVector<NetworkPacket> _processingPackets;
+    QVector<NetworkPacket> _packets;
     QHash<QUuid, int> _nodePacketCounts;
 
     QWaitCondition _hasPackets;