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

diff --git a/src/plpbus/OrbServerImpl.cc b/src/plpbus/OrbServerImpl.cc
index 1207f91..c22e3de 100644
--- a/src/plpbus/OrbServerImpl.cc
+++ b/src/plpbus/OrbServerImpl.cc
@@ -30,6 +30,7 @@ OrbServerImpl::OrbServerImpl()
 
 OrbServerImpl::~OrbServerImpl()
 {
+	_orb->destroy();
 	log_info("done\n");
 }
 
@@ -278,12 +279,12 @@ CosNaming::NamingContext_var OrbServerImpl::get_naming_service_context(const cha
 	ret_val	= NULL;
 	try {
 		// get nameservice reference
-		log_debug("started\n");
-		ns_obj	= _orb->resolve_initial_references(CONST_NAME_SERVICE_NAME);
+		//log_debug("started\n");
+		ns_obj	= _orb->resolve_initial_references("NameService");
 		if (CORBA::is_nil(ns_obj) == false) {
 			// get naming service context
-			ns_cntx	= CosNaming::NamingContext::_narrow(ns_obj);
-			if (CORBA::is_nil(ns_cntx) == false) {
+			ns_cntx	= CosNaming::NamingContext::_narrow(ns_obj.in());
+			if (CORBA::is_nil(ns_cntx.in()) == false) {
 				cntx_dta.length(1);
 				cntx_dta[0].id		= CORBA::string_dup(service_name_param);
 				cntx_dta[0].kind	= CORBA::string_dup(service_kind_param);
@@ -311,6 +312,7 @@ CosNaming::NamingContext_var OrbServerImpl::get_naming_service_context(const cha
 				catch(CosNaming::NamingContext::AlreadyBound& ex) {
 					log_error("Failed to get naming service context for %s. Context with same name already exist.\n", service_name_param);
 				}
+				//CORBA::release(ns_cntx);
 			}
 			else {
 				log_error("Failed to get naming service context for %s. Could not narrow the name service.\n", service_name_param);
@@ -338,7 +340,7 @@ CosNaming::NamingContext_var OrbServerImpl::get_naming_service_context(const cha
 	catch(CORBA::SystemException& ex) {
 		log_error("Failed to get naming service context for %s, system error.\n", service_name_param);
 	}
-	log_debug("done\n");
+	//log_debug("done\n");
 	return ret_val;
 }