small cleanups for error handling and memory leaks

[libplpbus.git] / src / plpbus / OrbServerImpl.cc

diff --git a/src/plpbus/OrbServerImpl.cc b/src/plpbus/OrbServerImpl.cc
index 6e097486f5e7571effb81d332957bbed22393a3c..9a48aba32fd12eba13b916924b871c9bcec902c4 100644 (file)
--- a/src/plpbus/OrbServerImpl.cc
+++ b/src/plpbus/OrbServerImpl.cc
@@ -64,13 +64,14 @@ char *OrbServerImpl::send_message_and_wait_response(const char* msg_req_param, :
        if (_listener != NULL) {
                log_debug("send_message_and_wait_response(): %s, server_callback != NULL\n", msg_req_param);
                _listener->request_received(msg_req_param, &msg_rsp);
+               //ret_val       = CORBA::string_dup(msg_rsp);
+               ret_val = CORBA::string_dup(msg_rsp);
        }
        else {
                log_error("send_message_and_wait_response() error, server callback == NULL\n");
-               msg_rsp = strdup(msg_req_param);
+               ret_val = CORBA::string_dup(msg_req_param);
                err_flg = -1;
        }
-       ret_val = CORBA::string_dup(msg_rsp);
        return ret_val;
 }
 
@@ -288,9 +289,7 @@ CosNaming::NamingContext_var OrbServerImpl::get_service_naming_context(const cha
                                        }
                                }
                                else {
-                                       log_debug("get_service_naming_context() 8\n");
                                        ret_val = CosNaming::NamingContext::_narrow(service_obj);
-                                       log_debug("get_service_naming_context() 9\n");
                                        if (CORBA::is_nil(ret_val) ) {
                                                log_error("Failed to get existing context from name service for %s, narrowing failed.\n", service_name_param);
                                        }