From 0c03fdd366d791203ae53061f6960bf496274c4e Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Fri, 23 Aug 2013 16:25:17 -0700
Subject: [PATCH] CR feedback

---
 voxel-server/src/NodeWatcher.cpp        |  2 +-
 voxel-server/src/NodeWatcher.h          |  2 +-
 voxel-server/src/VoxelNodeData.cpp      | 10 +++-------
 voxel-server/src/VoxelNodeData.h        |  2 +-
 voxel-server/src/VoxelPersistThread.cpp |  2 +-
 voxel-server/src/VoxelPersistThread.h   |  2 +-
 voxel-server/src/VoxelSendThread.cpp    |  5 +----
 voxel-server/src/VoxelSendThread.h      |  1 -
 voxel-server/src/main.cpp               |  2 +-
 9 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/voxel-server/src/NodeWatcher.cpp b/voxel-server/src/NodeWatcher.cpp
index dd3244326a..894e53b4b5 100644
--- a/voxel-server/src/NodeWatcher.cpp
+++ b/voxel-server/src/NodeWatcher.cpp
@@ -5,7 +5,7 @@
 //  Created by Brad Hefta-Gaub on 8/21/13
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
-//  Threaded or non-threaded object for sending voxels to a client
+//  Node List Hook that watches for Node's being killed in order to clean up node specific memory and threads
 //
 
 #include <NodeList.h>
diff --git a/voxel-server/src/NodeWatcher.h b/voxel-server/src/NodeWatcher.h
index 7d67397faa..a730f7d575 100644
--- a/voxel-server/src/NodeWatcher.h
+++ b/voxel-server/src/NodeWatcher.h
@@ -5,7 +5,7 @@
 //  Created by Brad Hefta-Gaub on 8/21/13
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
-//  Threaded or non-threaded object for sending voxels to a client
+//  Node List Hook that watches for Node's being killed in order to clean up node specific memory and threads
 //
 
 #ifndef __voxel_server__NodeWatcher__
diff --git a/voxel-server/src/VoxelNodeData.cpp b/voxel-server/src/VoxelNodeData.cpp
index 6d0d7d23cf..443edaaf2c 100644
--- a/voxel-server/src/VoxelNodeData.cpp
+++ b/voxel-server/src/VoxelNodeData.cpp
@@ -32,9 +32,7 @@ VoxelNodeData::VoxelNodeData(Node* owningNode) :
     // Create voxel sending thread...
     uint16_t nodeID = getOwningNode()->getNodeID();
     _voxelSendThread = new VoxelSendThread(nodeID);
-    if (_voxelSendThread) {
-        _voxelSendThread->initialize(true);
-    }
+    _voxelSendThread->initialize(true);
 }
 
 
@@ -59,10 +57,8 @@ void VoxelNodeData::writeToPacket(unsigned char* buffer, int bytes) {
 VoxelNodeData::~VoxelNodeData() {
     delete[] _voxelPacket;
 
-    if (_voxelSendThread) {
-        _voxelSendThread->terminate();
-        delete _voxelSendThread;
-    }
+    _voxelSendThread->terminate();
+    delete _voxelSendThread;
 }
 
 bool VoxelNodeData::updateCurrentViewFrustum() {
diff --git a/voxel-server/src/VoxelNodeData.h b/voxel-server/src/VoxelNodeData.h
index efe28243a7..e3abb7f415 100644
--- a/voxel-server/src/VoxelNodeData.h
+++ b/voxel-server/src/VoxelNodeData.h
@@ -18,7 +18,7 @@
 #include <VoxelNodeBag.h>
 #include <VoxelSceneStats.h>
 
-class VoxelSendThread; // forward declare
+class VoxelSendThread;
 
 class VoxelNodeData : public AvatarData {
 public:
diff --git a/voxel-server/src/VoxelPersistThread.cpp b/voxel-server/src/VoxelPersistThread.cpp
index 19c69bdc4b..ca40316d28 100644
--- a/voxel-server/src/VoxelPersistThread.cpp
+++ b/voxel-server/src/VoxelPersistThread.cpp
@@ -5,7 +5,7 @@
 //  Created by Brad Hefta-Gaub on 8/21/13
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
-//  Threaded or non-threaded voxel persistance
+//  Threaded or non-threaded voxel persistence
 //
 
 #include <NodeList.h>
diff --git a/voxel-server/src/VoxelPersistThread.h b/voxel-server/src/VoxelPersistThread.h
index bdf8bbd73c..68487da182 100644
--- a/voxel-server/src/VoxelPersistThread.h
+++ b/voxel-server/src/VoxelPersistThread.h
@@ -5,7 +5,7 @@
 //  Created by Brad Hefta-Gaub on 8/21/13
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
-//  Threaded or non-threaded voxel persistance
+//  Threaded or non-threaded voxel persistence
 //
 
 #ifndef __voxel_server__VoxelPersistThread__
diff --git a/voxel-server/src/VoxelSendThread.cpp b/voxel-server/src/VoxelSendThread.cpp
index 4c69c7f035..1db3d4864f 100644
--- a/voxel-server/src/VoxelSendThread.cpp
+++ b/voxel-server/src/VoxelSendThread.cpp
@@ -5,7 +5,7 @@
 //  Created by Brad Hefta-Gaub on 8/21/13
 //  Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
 //
-//  Threaded or non-threaded voxel persistance
+//  Threaded or non-threaded voxel packet sender
 //
 
 #include <NodeList.h>
@@ -19,9 +19,6 @@ VoxelSendThread::VoxelSendThread(uint16_t nodeID) :
     _nodeID(nodeID) {
 }
 
-VoxelSendThread::~VoxelSendThread() {
-}
-
 bool VoxelSendThread::process() {
     uint64_t  lastSendTime = usecTimestampNow();
     
diff --git a/voxel-server/src/VoxelSendThread.h b/voxel-server/src/VoxelSendThread.h
index 1d5af7b012..4cd04700bb 100644
--- a/voxel-server/src/VoxelSendThread.h
+++ b/voxel-server/src/VoxelSendThread.h
@@ -21,7 +21,6 @@
 class VoxelSendThread : public virtual GenericThread {
 public:
     VoxelSendThread(uint16_t nodeID);
-    ~VoxelSendThread();
 protected:
     /// Implements generic processing behavior for this thread.
     virtual bool process();
diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp
index 131ac9b7a2..56ea5003e1 100644
--- a/voxel-server/src/main.cpp
+++ b/voxel-server/src/main.cpp
@@ -177,7 +177,7 @@ int main(int argc, const char * argv[]) {
     }
     printf("wantVoxelPersist=%s\n", debug::valueOf(::wantVoxelPersist));
 
-    // if we want Voxel Persistance, load the local file now...
+    // if we want Voxel Persistence, load the local file now...
     bool persistantFileRead = false;
     if (::wantVoxelPersist) {