X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fplpbus%2FBusClient.cc;h=5c20d5d9a29055d4eaff3be39efa438030500f3c;hb=f6bd0d4fefd6459f2e8e5e7b813933be2d87dd47;hp=75583fe4cd9ffaf008830944d825403348eebff4;hpb=741398826280fe8ea212a0001f9b3d655fff6de9;p=libplpbus.git diff --git a/src/plpbus/BusClient.cc b/src/plpbus/BusClient.cc index 75583fe..5c20d5d 100644 --- a/src/plpbus/BusClient.cc +++ b/src/plpbus/BusClient.cc @@ -99,7 +99,7 @@ int BusClient::init(const char *server_name) { if (CORBA::is_nil(server_obj) == false) { _server = plpbus_orb::OrbServer::_narrow(server_obj); if (CORBA::is_nil(_server) == false) { - log_info("CORBA service found: %s", server_name); + log_info("CORBA service found: %s\n", server_name); ret_val = PLP_OK; } } @@ -114,7 +114,7 @@ int BusClient::init(const char *server_name) { } int BusClient::add_client_listener(IClientListener *listener_param) { - log_debug("add_client_listener() started\n"); + log_debug("started\n"); if (_poa == NULL) { OrbClientImpl *client_cb; PortableServer::ObjectId_var oid; @@ -126,7 +126,7 @@ int BusClient::add_client_listener(IClientListener *listener_param) { client_cb->_remove_ref(); _server->add_event_listener(_client, "event_message", CONST_DEFAULT_EVENT_INTERVAL); } - log_debug("add_client_listener() done\n"); + log_debug("done\n"); return 0; } @@ -161,6 +161,7 @@ int BusClient::send_message_and_wait_response(const BusMessage *msg_req_param, B seq = (DataItemSequence *)msg_req_param->_dataItemSeq; _server->send_dataitem_message_and_wait_response(*seq, seq_rsp); *msg_rsp_param = new BusMessageInternal(*seq_rsp); + delete(seq_rsp); return 0; } @@ -197,7 +198,7 @@ PortableServer::POA_var BusClient::create_poa(CORBA::ORB_var orb) { } } else { - cerr << "Failed to create RootPOA." << endl; + log_error("Failed to create RootPOA\n"); } return ret_val; } @@ -217,16 +218,16 @@ CosNaming::NamingContext_var BusClient::get_name_service_context(CORBA::ORB_var } catch (CORBA::ORB::InvalidName&) { // This should not happen! - cerr << "Could not find name service." << endl; + log_error("Could not find name service.\n"); } catch(CORBA::TRANSIENT& ex) { - cerr << "Could not find name service, verify that name service is running. " << endl; + log_error("Could not find name service, verify that name service is running.\n"); } catch (CORBA::NO_RESOURCES&) { - cerr << "Could not find name service, verify that name service is running. " << endl; + log_error("Could not find name service, verify that name service is running.\n"); } catch(CORBA::SystemException& ex) { - cerr << "Could not find name service, unknown reason. " << endl; + log_error("Could not find name service, unknown reason.\n"); } return ret_val; }