1 files changed, 2 insertions, 6 deletions
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index b3b464e92..e7ff11c5c 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -304,12 +304,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()