diff options
| author | Steve Huston <shuston@riverace.com> | 2010-07-15 21:35:23 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2010-07-15 21:35:23 +0000 |
| commit | db06192e0ab952ae8600ffe9087ab5caa7429282 (patch) | |
| tree | 9671c9c82dc795fe1bbe079fd4325ab3804a229e | |
| parent | c55d527f08631fb2ba347f2b6de310eb6dc5d1cd (diff) | |
| download | ATCD-db06192e0ab952ae8600ffe9087ab5caa7429282.tar.gz | |
ChangeLogTag:Thu Jul 15 17:53:47 UTC 2010 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | ace/Service_Gestalt.cpp | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ed0ff688969..bdc28dddef3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Thu Jul 15 17:53:47 UTC 2010 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/Service_Gestalt.cpp: + * THANKS: + + Restore pre-gestalt behavior of returning -1 if svc.conf does + not exist and an ACE_Service_Config::open() is expecting to use + the default file. + + Thanks to Daynesh Mangal (daynesh@gmail.com) for reporting the + errant behavior. + Sun Jul 04 18:57:33 CEST 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ACE version 5.8 released. @@ -2325,6 +2325,7 @@ Ed Blackmond <ed dot blackmond at themis dot com> Dave <dwh0403 at 163 dot com> Inma Perea <inma dot perea dot fdz at gmail dot com> David Ward <dpward at mit dot edu> +Daynesh Mangal <daynesh at gmail dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/Service_Gestalt.cpp b/ace/Service_Gestalt.cpp index 892e1b00a75..0a52b2bc539 100644 --- a/ace/Service_Gestalt.cpp +++ b/ace/Service_Gestalt.cpp @@ -1236,7 +1236,7 @@ ACE_Service_Gestalt::process_directives (bool ignore_default_svc_conf_file) if (this->svc_conf_file_queue_ == 0 || this->svc_conf_file_queue_->is_empty ()) - return 0; + return -1; ACE_TString *sptr = 0; ACE_TString default_svc_conf (ACE_DEFAULT_SVC_CONF); |