From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 11 Jun 2012 20:32:14 +0000 (+0530)
Subject: [2024] Reset callback_ during SetUp() instead of in setDNSService()
X-Git-Tag: trac2351_base~226^2~58^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3eaafc4154640f7c6ebf026fc4592f05a0872aa2;p=thirdparty%2Fkea.git

[2024] Reset callback_ during SetUp() instead of in setDNSService()
---

diff --git a/src/lib/resolve/tests/recursive_query_unittest.cc b/src/lib/resolve/tests/recursive_query_unittest.cc
index eaceef84d3..ff28ec5daf 100644
--- a/src/lib/resolve/tests/recursive_query_unittest.cc
+++ b/src/lib/resolve/tests/recursive_query_unittest.cc
@@ -175,6 +175,10 @@ protected:
         resolver_.reset();
     }
 
+    void SetUp() {
+        callback_.reset(new ASIOCallBack(this));
+    }
+
     // Send a test UDP packet to a mock server
     void sendUDP(const int family) {
         ScopedAddrInfo sai(resolveAddress(family, IPPROTO_UDP, false));
@@ -326,7 +330,6 @@ protected:
     // Set up empty DNS Service
     // Set up an IO Service queue without any addresses
     void setDNSService() {
-        callback_.reset(new ASIOCallBack(this));
         dns_service_.reset(new DNSService(io_service_, callback_.get(), NULL,
                                           NULL));
     }