X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fplpbus%2FOrbServerImpl.cc;h=1207f912c31d3900d8a78cf13a0dfcee8b22097a;hb=db8faefedaf3d3e94865002485d8b5fa491ce4c5;hp=0a037f26e23462ad1245b183d15a729d423defd1;hpb=f6bd0d4fefd6459f2e8e5e7b813933be2d87dd47;p=libplpbus.git

diff --git a/src/plpbus/OrbServerImpl.cc b/src/plpbus/OrbServerImpl.cc
index 0a037f2..1207f91 100644
--- a/src/plpbus/OrbServerImpl.cc
+++ b/src/plpbus/OrbServerImpl.cc
@@ -93,7 +93,7 @@ void OrbServerImpl::send_dataitem_message_and_request_response(OrbClient_ptr res
 			msg_rsp	= new BusMessage(msg_req->get_type(&err_flg));
 			_listener->request_received(msg_req, msg_rsp);
 			seq	= (DataItemSequence *)msg_rsp->_dataItemSeq;
-			log_debug("msg_rsp length: %ld\n", seq->length());
+			log_debug("msg_rsp length: %lu\n", (long unsigned int)seq->length());
 			msg_rsp->printout();
 			response_listener_param->receive_response_dataitem_sequence(*seq);
 			delete(msg_req);
@@ -105,25 +105,25 @@ void OrbServerImpl::send_dataitem_message_and_request_response(OrbClient_ptr res
 	}
 }
 
+void copy( const DataItemSequence& orig_seq )
+{
+	DataItemSequence new_seq;
+
+	new_seq	= orig_seq;
+}
+
 CORBA::Long OrbServerImpl::send_dataitem_message_and_wait_response(const DataItemSequence& req_seq_param,
 								DataItemSequence_out rsp_seq_param) {
-	BusMessage		*msg_req;
-	BusMessage		*msg_rsp;
-	DataItemSequence	*seq;
-	int			err_flg;
+	BusMessage	*msg_req;
+	BusMessage	*msg_rsp;
+	int		err_flg;
 
-	seq	= NULL;
-	msg_rsp	= NULL;
 	msg_req	= new BusMessageInternal(req_seq_param);
 	msg_rsp	= new BusMessage(msg_req->get_type(&err_flg));
 	_listener->request_received(msg_req, msg_rsp);
-	if (msg_rsp != NULL) {
-		seq	= (DataItemSequence *)msg_rsp->_dataItemSeq;
-	}
-	else {
-		seq	= new DataItemSequence();
-	}
-	rsp_seq_param._data	= seq;
+	rsp_seq_param._data	= new DataItemSequence(*(msg_rsp->_dataItemSeq));
+	delete(msg_req);
+	delete(msg_rsp);
 
 	return 0;
 }
@@ -332,8 +332,8 @@ CosNaming::NamingContext_var OrbServerImpl::get_naming_service_context(const cha
 		log_error("Failed to get context from name service for %s, Naming service is not running or has configuration problem.\n", service_name_param);
 		log_error("Check-list:\n");
 		log_error("If you have OMNIORB_CONFIG environment variable defined, verify that omniORB.cfg file exist in that location.\n");
-		log_error("If you do not have OMNIORB_CONFIG environment variable defined, verify that you have /etc/omniORB.cfg file\n");
-		log_error("Verify that InitRef line is defined in omniORB.cfg file.\n");
+		log_error("If you do not have OMNIORB_CONFIG environment variable defined, verify that you have /etc/omniORB.cfg file.\n");
+		log_error("Verify that InitRef line is defined in /etc/omniORB.cfg file.\n");
 	}
 	catch(CORBA::SystemException& ex) {
 		log_error("Failed to get naming service context for %s, system error.\n", service_name_param);