diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-11-15 13:30:03 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-11-15 13:30:03 +0000 |
| commit | ab348eae6b04532af2080eed82e7204e110c16f9 (patch) | |
| tree | 06c081868a7821debbb7116b7ac5c9c7a5fa03b4 | |
| parent | 203c1a92684fc75c7c0cecce1ffe271288e9d958 (diff) | |
| download | ATCD-ab348eae6b04532af2080eed82e7204e110c16f9.tar.gz | |
ChangeLogTag:Tue Nov 15 07:28:35 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Kokyu/README | 2 | ||||
| -rw-r--r-- | ace/Service_Config.cpp | 9 |
3 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index f866588325f..28a6b2c396c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Nov 15 07:28:35 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu> + + * ace/Service_Config.cpp (initialize): Added a check to avoid + overwriting a service that's already installed without having it + explicitly removed first. Thanks to Domingos Monteiro <d dot + monteiro at netia dot net> for this fix. + Mon Nov 14 08:25:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * ace/WIN32_Asynch_IO.cpp: diff --git a/Kokyu/README b/Kokyu/README index 2cd0f79a6f4..9db0e95225b 100644 --- a/Kokyu/README +++ b/Kokyu/README @@ -6,7 +6,7 @@ context of higher-level middleware. Kokyu currently provides real-time scheduling and dispatching services for TAO's real-time Event Service which mediates supplier-consumer relationships between application operations. Kokyu also provides a scheduling and dispatching framework -for threads. This is being used by the TAO RTCORBA 2.0 scheduler +for threads. This is being used by the TAO RTCORBA 1.2 scheduler implementations. For more information, see ACE_wrappers/Kokyu/docs/Kokyu.html diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index b68e8eb4de8..6ce11c79bf1 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -352,6 +352,15 @@ ACE_Service_Config::initialize (const ACE_Service_Type *sr, ACE_LIB_TEXT ("opening dynamic service %s\n"), sr->name ())); + ACE_Service_Type *srp = 0; + if (ACE_Service_Repository::instance ()->find + (sr->name (), + (const ACE_Service_Type **) &srp) >= 0) + ACE_RETURN ((LM_DEBUG, + ACE_LIB_TEXT ("%s already installed, please remove first before reinstalling\n"), + sr->name ()), + 0); + if (sr->type ()->init (args.argc (), args.argv ()) == -1) { |