From 4fca6cba05f9baf91b31afd87f06086f86e83ad7 Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Mon, 7 Dec 2009 14:52:57 +0000 Subject: Mon Dec 7 14:52:43 UTC 2009 William R. Otte --- CIAO/ChangeLog | 13 +++++++++++-- CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp | 2 +- CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp | 4 +++- CIAO/ciao/ComponentServer/CIAO_Container_Impl.h | 8 ++++---- CIAO/ciao/Containers/Session/Session_Container.cpp | 11 +++++++++-- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index f0531f42dce..e058cb65480 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Mon Dec 7 14:52:43 UTC 2009 William R. Otte + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * ciao/ComponentServer/CIAO_Container_Impl.h: + * ciao/ComponentServer/CIAO_Container_Impl.cpp: + * ciao/Containers/Session/Session_Container.cpp: + + Integration. + Mon Dec 7 14:11:14 UTC 2009 William R. Otte * ciao/ComponentServer/CIAO_ComponentServer.idl: @@ -8,8 +17,8 @@ Mon Dec 7 14:11:14 UTC 2009 William R. Otte * ciao/Containers/Session/Session_Container.cpp: * ciao/Servants/Servant_Impl_Base.h: - Container code. - + Container code. + Sat Dec 5 05:33:43 UTC 2009 William R. Otte * DAnCE/Deployment/Deployment_DeploymentPlan.idl: diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp index 80c3200b9a0..6ba94f41d6a 100644 --- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -2095,7 +2095,7 @@ NodeApplication_Impl::connect_local_receptacle (Components::CCMObject_ptr facet, ACE_TEXT ("Connecting local facet %C to receptacle %C\n"), facet_name.c_str (), recep_name.c_str ())); - // Need to insert invocation on container. + cont->connect_local_facet (facet, facet_name.c_str (), receptacle, recep_name.c_str ()); } catch (CORBA::Exception &ex) { // @@todo: need better exception handling. diff --git a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp index 25284cc0d55..379ca801bd0 100644 --- a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp +++ b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.cpp @@ -474,6 +474,8 @@ namespace CIAO const char * user_port) { CIAO_TRACE ("CIAO_Container_i::connect_local_facet"); + this->container_->connect_local_facet (provider, provider_port, user, user_port); + } void CIAO_Container_i::disconnect_local_facet (::Components::CCMObject_ptr provider, @@ -482,7 +484,7 @@ namespace CIAO const char * user_port) { CIAO_TRACE ("CIAO_Container_i::connect_local_facet"); - + this->container_->disconnect_local_facet (provider, provider_port, user, user_port); } } } diff --git a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h index 80cc987d661..9d1b1ec3c51 100644 --- a/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h +++ b/CIAO/ciao/ComponentServer/CIAO_Container_Impl.h @@ -72,14 +72,14 @@ namespace CIAO virtual PortableServer::POA_ptr _default_POA (void); - virtual void connect_local_facet (::Components::CCMHome_ptr provider, + virtual void connect_local_facet (::Components::CCMObject_ptr provider, const char * provider_port, - ::Components::CCMHome_ptr user, + ::Components::CCMObject_ptr user, const char * user_port); - virtual void disconnect_local_facet (::Components::CCMHome_ptr provider, + virtual void disconnect_local_facet (::Components::CCMObject_ptr provider, const char * provider_port, - ::Components::CCMHome_ptr user, + ::Components::CCMObject_ptr user, const char * user_port); private: diff --git a/CIAO/ciao/Containers/Session/Session_Container.cpp b/CIAO/ciao/Containers/Session/Session_Container.cpp index 27e80d37a76..b3ecd3c5a7e 100644 --- a/CIAO/ciao/Containers/Session/Session_Container.cpp +++ b/CIAO/ciao/Containers/Session/Session_Container.cpp @@ -699,10 +699,17 @@ namespace CIAO try { - ::CORBA::LocalObject_ptr exec (prov_serv->get_facet_executor (provider_port)); + ::CORBA::Object_ptr exec (prov_serv->get_facet_executor (provider_port)); // Note: Spec says that facet executor provided by component MAY BE NIL - + user_serv->connect (user_port, exec); + } + catch (::Components::InvalidConnection &ex) + { + CIAO_ERROR ((LM_ERROR, CLINFO "Session_Container::connect_local_facet - " + "Caught InvliadConnection exception while attempting to connect facet %C to " + "receptacle %C\n", provider_port, user_port)); + throw; } } -- cgit v1.2.1