[#30,!37] Renamed variable.

diff --git a/src/bin/d2/d2_process.cc b/src/bin/d2/d2_process.cc
index 9ac6f071130dfed46904fe596b5fb389d2b52d19..77c99c13ba713f8f72ab5472b379b9623fa5e9ad 100644 (file)
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -222,9 +222,11 @@ D2Process::configure(isc::data::ConstElementPtr config_set, bool check_only) {
 
     // Set the command channel.
     try {
-        isc::data::ConstElementPtr staging_socket;
-        staging_socket = getD2CfgMgr()->getControlSocketInfo();
-        configureCommandChannel(current_socket, staging_socket);
+        isc::data::ConstElementPtr socket_info;
+        socket_info = getD2CfgMgr()->getControlSocketInfo();
+        if (socket_info) {
+            configureCommandChannel(current_socket, socket_info);
+        }
     } catch (const isc::Exception& ex) {
         answer = isc::config::createAnswer(CONTROL_RESULT_ERROR, ex.what());
         return (answer);