diff options
author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-07 02:40:25 +0000 |
---|---|---|
committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-07-07 02:40:25 +0000 |
commit | 2e31846b7060a81bff37df0c345728f9cf899169 (patch) | |
tree | 1488571d2291948d402b974e9a519f49a0dd8087 | |
parent | 5b805cc057a2401770c1872076109153f806e701 (diff) | |
download | ATCD-2e31846b7060a81bff37df0c345728f9cf899169.tar.gz |
*** empty log message ***
-rw-r--r-- | TAO/CIAO/tools/RTComponentServer/ChangeLog | 7 | ||||
-rw-r--r-- | TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/TAO/CIAO/tools/RTComponentServer/ChangeLog b/TAO/CIAO/tools/RTComponentServer/ChangeLog index 8565f4d8725..7a1dd9235d3 100644 --- a/TAO/CIAO/tools/RTComponentServer/ChangeLog +++ b/TAO/CIAO/tools/RTComponentServer/ChangeLog @@ -1,3 +1,10 @@ +Sun Jul 06 21:37:22 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * tools/RTComponentServer/ComponentServer_Task.cpp (svc): Changed + to take advantage of CIAO::Activator_Callback interface change + for getting back our own ConfigValues. We will need to use + these configuration values in the future. + Sun Jul 06 11:50:48 2003 Nanbor Wang <nanbor@cs.wustl.edu> * tools/RTComponentServer/ComponentServer_Task.cpp: diff --git a/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp b/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp index 239593737d3..aa26de129b9 100644 --- a/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp +++ b/TAO/CIAO/tools/RTComponentServer/ComponentServer_Task.cpp @@ -80,6 +80,7 @@ CIAO::ComponentServer_Task::svc () Components::Deployment::ServerActivator_var activator; + Components::ConfigValues_var config; if (this->options_.use_callback_) { @@ -92,13 +93,17 @@ CIAO::ComponentServer_Task::svc () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; + Components::ConfigValues_out config_out (config.out ()); + activator - = act_callback->register_component_server (comserv_obj.in () - ACE_ENV_ARG_PARAMETER); + = act_callback->register_component_server (comserv_obj.in (), + config_out + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } comserv_servant->set_objref (activator.in (), + config.in (), comserv_obj.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |