[#1147] Addressed comments

diff --git a/src/bin/dhcp4/client_handler.cc b/src/bin/dhcp4/client_handler.cc
index 4d68679523d6d6b2ac8b44ce0bbe1f8ae8cdd79d..e91dc8fc31f3ff70aa8c898d7ac69c7f69722e77 100644 (file)
--- a/src/bin/dhcp4/client_handler.cc
+++ b/src/bin/dhcp4/client_handler.cc
@@ -85,7 +85,7 @@ ClientHandler::lookup(const DuidPtr& duid) {
     }
     auto it = clients_client_id_.find(duid->getDuid());
     if (it == clients_client_id_.end()) {
-        return (0);
+        return (ClientPtr());
     }
     return (*it);
 }
@@ -101,7 +101,7 @@ ClientHandler::lookup(const HWAddrPtr& hwaddr) {
     auto key = boost::make_tuple(hwaddr->htype_, hwaddr->hwaddr_);
     auto it = clients_hwaddr_.find(key);
     if (it == clients_hwaddr_.end()) {
-        return (0);
+        return (ClientPtr());
     }
     return (*it);
 }

diff --git a/src/bin/dhcp4/client_handler.h b/src/bin/dhcp4/client_handler.h
index 5a29074c40a0e75e10d23622a187d36313114585..236f2551f3ec44abfdffeea355a02008b6ac7a15 100644 (file)
--- a/src/bin/dhcp4/client_handler.h
+++ b/src/bin/dhcp4/client_handler.h
@@ -51,7 +51,7 @@ public:
     ///
     /// Lookup the client:
     ///  - if not found insert the client in the clients map and return true
-    ///  - if found, if  has a continuation put it in the holder,
+    ///  - if found, if has a continuation put it in the holder,
     ///    and return false
     ///
     /// @param query The query from the client.

diff --git a/src/bin/dhcp6/client_handler.cc b/src/bin/dhcp6/client_handler.cc
index f7c323a960ffd79ddfb6e0fae1c198b7d594751b..38518627e1bc417d0bea7fdec566918cda2261a6 100644 (file)
--- a/src/bin/dhcp6/client_handler.cc
+++ b/src/bin/dhcp6/client_handler.cc
@@ -52,7 +52,7 @@ ClientHandler::lookup(const DuidPtr& duid) {
     }
     auto it = clients_.find(duid->getDuid());
     if (it == clients_.end()) {
-        return (0);
+        return (ClientPtr());
     }
     return (*it);
 }

diff --git a/src/bin/dhcp6/client_handler.h b/src/bin/dhcp6/client_handler.h
index b7a4a2783d453eab868d7b9af5e9dcf2b5bf102c..1f99255f8a3c9e19f12a0fe45ef33e5afa5b9d8b 100644 (file)
--- a/src/bin/dhcp6/client_handler.h
+++ b/src/bin/dhcp6/client_handler.h
@@ -49,7 +49,7 @@ public:
     ///
     /// Lookup the client:
     ///  - if not found insert the client in the clients map and return true
-    ///  - if found, if  has a continuation put it in the holder,
+    ///  - if found, if has a continuation put it in the holder,
     ///    and return false
     ///
     /// @param query The query from the client.