Merge pull request #2132

464afd4d Ensure DNSResolver destructor runs on exit (Howard Chu)
This commit is contained in:
Riccardo Spagni
2017-08-07 14:46:26 +02:00
+2 -6
View File
@@ -307,12 +307,8 @@ DNSResolver& DNSResolver::instance()
{
boost::lock_guard<boost::mutex> lock(instance_lock);
static DNSResolver* staticInstance = NULL;
if (staticInstance == NULL)
{
staticInstance = new DNSResolver();
}
return *staticInstance;
static DNSResolver staticInstance;
return staticInstance;
}
DNSResolver DNSResolver::create()