X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2Fplpbus%2FOrbServerImpl.cc;h=3fa74a005dd95e1e05e5607617d68c8dcd4ddd2a;hb=f5c7f7f3ac73c1caaf655127ecf708d49509d6a8;hp=1c8bfb5724f16a785f45962c3c8d04289e12a072;hpb=396eb8d27636cd63e15dc4321ac201d9e010a56b;p=libplpbus.git

diff --git a/src/plpbus/OrbServerImpl.cc b/src/plpbus/OrbServerImpl.cc
index 1c8bfb5..3fa74a0 100644
--- a/src/plpbus/OrbServerImpl.cc
+++ b/src/plpbus/OrbServerImpl.cc
@@ -105,11 +105,16 @@ CORBA::Long OrbServerImpl::send_dataitem_message_and_wait_response(const DataIte
 	BusMessage		*msg_rsp;
 	DataItemSequence	*seq;
 
-	msg_req	= new BusMessageInternal(req_seq_param);
+	seq	= NULL;
 	msg_rsp	= NULL;
+	msg_req	= new BusMessageInternal(req_seq_param);
 	_listener->request_received(msg_req, &msg_rsp);
-	//rsp_seq_param	= new DataItemSequence_out(msg_rsp._dataItemSeq);
-	seq			= (DataItemSequence *)msg_rsp->_dataItemSeq;
+	if (msg_rsp != NULL) {
+		seq	= (DataItemSequence *)msg_rsp->_dataItemSeq;
+	}
+	else {
+		seq	= new DataItemSequence();
+	}
 	rsp_seq_param._data	= seq;
 
 	return 0;