diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-30 22:47:03 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2011-10-30 22:47:03 +0000 |
| commit | 5aae9832f83c0ae8d5e4f078c06ce4f4af493a62 (patch) | |
| tree | 89751c111fd9aa3c7df5c1d7b64ecfa7f5c96ab9 | |
| parent | a28eaeb59ba03a2d4aa6944ccb34b94dcc7cc08b (diff) | |
| download | ATCD-5aae9832f83c0ae8d5e4f078c06ce4f4af493a62.tar.gz | |
Sun Oct 30 22:42:44 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu>
* bin/ciao.localityconfig:
* dance/LocalityManager/Scheduler/Events/Connect.cpp:
* dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp:
Moved name service resolution of external reference endpoints into the
CIAO deployment interceptors.
| -rw-r--r-- | DAnCE/ChangeLog | 9 | ||||
| -rw-r--r-- | DAnCE/bin/ciao.localityconfig | 2 | ||||
| -rw-r--r-- | DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp | 4 | ||||
| -rw-r--r-- | DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp | 36 |
4 files changed, 22 insertions, 29 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index adb0bafde69..8edbe95f424 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,12 @@ +Sun Oct 30 22:42:44 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * bin/ciao.localityconfig: + * dance/LocalityManager/Scheduler/Events/Connect.cpp: + * dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp: + + Moved name service resolution of external reference endpoints into the + CIAO deployment interceptors. + Tue Oct 25 17:30:32 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * tools/Split_Plan/Split_Plan.cpp: diff --git a/DAnCE/bin/ciao.localityconfig b/DAnCE/bin/ciao.localityconfig index e88358bec12..c16d271096f 100644 --- a/DAnCE/bin/ciao.localityconfig +++ b/DAnCE/bin/ciao.localityconfig @@ -3,5 +3,5 @@ edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Home_Ha edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Component_Handler edu.vanderbilt.dre.DAnCE.InstanceHandler CIAO_Deployment_Handlers create_Homed_Component_Handler edu.vanderbilt.dre.DAnCE.DeploymentInterceptor CIAO_Deployment_Interceptors create_CIAO_StoreReferences +edu.vanderbilt.dre.DAnCE.DeploymentInterceptor CIAO_Deployment_Interceptors create_CIAO_ReferenceLookup edu.vanderbilt.dre.DAnCE.DeploymentInterceptor DAnCE_Error_Interceptors create_DAnCE_Standard_Error - diff --git a/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp b/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp index b5160dc616c..17adb9d9193 100644 --- a/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp +++ b/DAnCE/dance/LocalityManager/Scheduler/Events/Connect.cpp @@ -40,8 +40,8 @@ namespace DAnCE DANCE_TRACE ("Connect_Instance::invoke_pre_interceptor"); (*i)->pre_connect (this->plan_, - this->connectionRef_, - this->provided_ref_); + this->connectionRef_, + this->provided_ref_); } diff --git a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp index 1cef97a7853..6ec8a70e0cf 100644 --- a/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp +++ b/DAnCE/dance/Plan_Launcher/Plan_Launcher_Base_Impl_T.cpp @@ -665,32 +665,16 @@ Plan_Launcher_Base_Impl< Manager, AppManager, Application> try { - CORBA::Object_ptr - obj = this->orb_->string_to_object(plan.connection[i].externalReference[0].location.in()); - - if (!CORBA::is_nil (obj)) - { - CORBA::ULong indx = 0; - for (; indx < conn.length (); ++indx) - - if (ACE_OS::strcmp (conn[indx].name.in (), - plan.connection[i].name.in ()) == 0) - break; - - if (indx == conn.length()) - conn.length(indx + 1); - conn[indx].name= CORBA::string_dup (plan.connection[i].name.in()); - conn[indx].endpoint.length(1L); - conn[indx].endpoint[0] = obj; - } - else - { - DANCE_ERROR (DANCE_LOG_WARNING, - (LM_DEBUG, DLINFO - ACE_TEXT("Plan_Launcher_i::create_external_connections - ") - ACE_TEXT("can't create object for IOR %C\n"), - plan.connection[i].externalReference[0].location.in())); - } + CORBA::ULong indx = 0; + for (; indx < conn.length (); ++indx) + if (ACE_OS::strcmp (conn[indx].name.in (), + plan.connection[i].name.in ()) == 0) + break; + + if (indx == conn.length()) + conn.length(indx + 1); + conn[indx].name= CORBA::string_dup (plan.connection[i].name.in()); + conn[indx].endpoint.length (1); } catch (CORBA::Exception &ex) { |