From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 2 Apr 2014 11:23:16 +0000 (-0400)
Subject: [3080] A few additional minor review corrections.
X-Git-Tag: bind10-1.2.0rc1-release~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0a4d644ecd7f473add91b295befac1206f58e76;p=thirdparty%2Fkea.git

[3080] A few additional minor review corrections.

PgSqlLeaseMgr::openDatabase now sets conn_ to NULL after calling PQfinish.
PgSqlLeaseMgr constructor, moved member inits to the initializer list
Fixed exception text.
---

diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
index d3a5a02862..953b560fee 100644
--- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc
@@ -280,9 +280,9 @@ public:
         if (!lease_->hwaddr_.empty()) {
             if (lease->hwaddr_.size() > HWAddr::MAX_HWADDR_LEN) {
                 isc_throw(DbOperationError,
-                          "Attempted to store Hardware address longer ("
+                          "Hardware address length : "
                           << lease->hwaddr_.size()
-                          << " than allowed maximum of "
+                          << " exceeds maximum allowed of: "
                           << HWAddr::MAX_HWADDR_LEN);
             }
 
@@ -569,13 +569,10 @@ private:
 };
 
 PgSqlLeaseMgr::PgSqlLeaseMgr(const LeaseMgr::ParameterMap& parameters)
-    : LeaseMgr(parameters) {
-    conn_ = NULL;
+    : LeaseMgr(parameters), exchange4_(new PgSqlLease4Exchange()),
+    exchange6_(new PgSqlLease6Exchange()), conn_(NULL) {
     openDatabase();
     prepareStatements();
-
-    exchange4_.reset(new PgSqlLease4Exchange());
-    exchange6_.reset(new PgSqlLease6Exchange());
 }
 
 PgSqlLeaseMgr::~PgSqlLeaseMgr() {
@@ -590,6 +587,7 @@ PgSqlLeaseMgr::~PgSqlLeaseMgr() {
 
         PQclear(r);
         PQfinish(conn_);
+        conn_ = NULL;
     }
 }
 
@@ -665,6 +663,7 @@ PgSqlLeaseMgr::openDatabase() {
         // to release it, but grab the error message first.
         std::string error_message = PQerrorMessage(conn_);
         PQfinish(conn_);
+        conn_ = NULL;
         isc_throw(DbOpenError, error_message);
     }
 }