From 484c0d30cb92d9794d9bac6837fe2d33b52a8282 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 6 Oct 2014 09:54:52 -0700
Subject: [PATCH] don't require refresh of NetworkAccessManager, should handle
 restarts

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

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 5a8f8fb40e..7352729fa4 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -57,9 +57,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
     setApplicationName("domain-server");
     QSettings::setDefaultFormat(QSettings::IniFormat);
     
-    // force a refresh of the NetworkAccessManager instance for this thread
-    NetworkAccessManager::getInstance(true);
-    
     // make sure we have a fresh AccountManager instance
     // (need this since domain-server can restart itself and maintain static variables)
     AccountManager::getInstance(true);
diff --git a/libraries/networking/src/NetworkAccessManager.cpp b/libraries/networking/src/NetworkAccessManager.cpp
index 161170a87d..841b7491c7 100644
--- a/libraries/networking/src/NetworkAccessManager.cpp
+++ b/libraries/networking/src/NetworkAccessManager.cpp
@@ -15,9 +15,9 @@
 
 QThreadStorage<QNetworkAccessManager*> networkAccessManagers;
 
-QNetworkAccessManager& NetworkAccessManager::getInstance(bool forceReset) {
-    if (!networkAccessManagers.hasLocalData() || forceReset) {
-            networkAccessManagers.setLocalData(new QNetworkAccessManager());
+QNetworkAccessManager& NetworkAccessManager::getInstance() {
+    if (!networkAccessManagers.hasLocalData()) {
+        networkAccessManagers.setLocalData(new QNetworkAccessManager());
     }
     
     return *networkAccessManagers.localData();
diff --git a/libraries/networking/src/NetworkAccessManager.h b/libraries/networking/src/NetworkAccessManager.h
index 3a236f7041..d911d935dc 100644
--- a/libraries/networking/src/NetworkAccessManager.h
+++ b/libraries/networking/src/NetworkAccessManager.h
@@ -18,7 +18,7 @@
 class NetworkAccessManager : public QObject {
     Q_OBJECT
 public:
-    static QNetworkAccessManager& getInstance(bool forceReset = false);
+    static QNetworkAccessManager& getInstance();
 };
 
 #endif // hifi_NetworkAccessManager_h
\ No newline at end of file