diff options
| author | Steve Huston <shuston@riverace.com> | 2010-07-15 21:30:52 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2010-07-15 21:30:52 +0000 |
| commit | 047cc168b4d41a343a73011950cee49823b181da (patch) | |
| tree | a1c49124db11619352c2eb6558cd86c821e6a8ab | |
| parent | 09d9419bafb28c7d36b5db544b1e0d30fa7464cf (diff) | |
| download | ATCD-047cc168b4d41a343a73011950cee49823b181da.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/LSOCK_Acceptor.cpp | 3 | ||||
| -rw-r--r-- | ace/Service_Gestalt.cpp | 2 | ||||
| -rw-r--r-- | tests/tests.mpc | 8 |
5 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index e9f459deb0c..2a803927e72 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. + Thu Jun 24 02:07:18 UTC 2010 Steve Huston <shuston@riverace.com> * ace/Service_Gestalt.inl (open): Allow the command line options to @@ -2292,6 +2292,7 @@ Rob Beekmans <r dot a dot beekmans at philips dot com> Steven Hartmann <shartmann at militho dot com> Dicky <qianchendi at gmail dot com> Boyan Kasarov <bkasarov at gmail dot com> +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/LSOCK_Acceptor.cpp b/ace/LSOCK_Acceptor.cpp index d192c5003e8..6d981c7abad 100644 --- a/ace/LSOCK_Acceptor.cpp +++ b/ace/LSOCK_Acceptor.cpp @@ -75,7 +75,8 @@ ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor (const ACE_Addr &remote_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - "ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor")); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_LSOCK_Acceptor::ACE_LSOCK_Acceptor"))); } // General purpose routine for accepting new connections. diff --git a/ace/Service_Gestalt.cpp b/ace/Service_Gestalt.cpp index 8b395d88b89..ad60e9ed096 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); diff --git a/tests/tests.mpc b/tests/tests.mpc index 16f69453a1d..1fd4cdc06a8 100644 --- a/tests/tests.mpc +++ b/tests/tests.mpc @@ -456,6 +456,14 @@ project(Conn Test) : acetest { } } +project(Connector Test) : acetest { + avoids += ace_for_tao + exename = Connector_Test + Source_Files { + Connector_Test.cpp + } +} + project(Date Time Test) : acetest { avoids += ace_for_tao exename = Date_Time_Test |