From ffb628edfb3538c6edab4bfb158bd2fbdd3429e4 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 17 Jan 2014 12:18:41 -0800
Subject: [PATCH] remove the DomainServer singleton instance from DS

---
 domain-server/src/DomainServer.cpp | 12 ++----------
 domain-server/src/DomainServer.h   |  6 +-----
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index ed0796af65..5db1c668fe 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -28,8 +28,6 @@ void signalhandler(int sig){
     }
 }
 
-DomainServer* DomainServer::domainServerInstance = NULL;
-
 const quint16 DOMAIN_SERVER_HTTP_PORT = 8080;
 
 DomainServer::DomainServer(int argc, char* argv[]) :
@@ -43,8 +41,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     _metavoxelServerConfig(NULL),
     _hasCompletedRestartHold(false)
 {
-    DomainServer::setDomainServerInstance(this);
-
     signal(SIGINT, signalhandler);
 
     const char CUSTOM_PORT_OPTION[] = "-p";
@@ -253,10 +249,6 @@ void DomainServer::readAvailableDatagrams() {
     }
 }
 
-void DomainServer::setDomainServerInstance(DomainServer* domainServer) {
-    domainServerInstance = domainServer;
-}
-
 QJsonObject jsonForSocket(const HifiSockAddr& socket) {
     QJsonObject socketJSON;
 
@@ -322,9 +314,9 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QString&
             QJsonObject queuedAssignmentsJSON;
             
             // add the queued but unfilled assignments to the json
-            std::deque<Assignment*>::iterator assignment = domainServerInstance->_assignmentQueue.begin();
+            std::deque<Assignment*>::iterator assignment = _assignmentQueue.begin();
             
-            while (assignment != domainServerInstance->_assignmentQueue.end()) {
+            while (assignment != _assignmentQueue.end()) {
                 QJsonObject queuedAssignmentJSON;
                 
                 QString uuidString = uuidStringWithoutCurlyBraces((*assignment)->getUUID());
diff --git a/domain-server/src/DomainServer.h b/domain-server/src/DomainServer.h
index 17f0904e21..e608f9ea00 100644
--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@@ -29,16 +29,12 @@ public:
     bool handleHTTPRequest(HTTPConnection* connection, const QString& path);
     
     void exit(int retCode = 0);
-
-    static void setDomainServerInstance(DomainServer* domainServer);
     
 public slots:
     /// Called by NodeList to inform us that a node has been killed.
     void nodeKilled(SharedNodePointer node);
     
-private:    
-    static DomainServer* domainServerInstance;
-    
+private:
     void prepopulateStaticAssignmentFile();
     Assignment* matchingStaticAssignmentForCheckIn(const QUuid& checkInUUID, NODE_TYPE nodeType);
     Assignment* deployableAssignmentForRequest(Assignment& requestAssignment);