diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-04-23 17:49:53 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-04-23 17:49:53 +0000 |
| commit | 70fa417394cdd488af43666d0e4e03bcb7ab90a6 (patch) | |
| tree | 79f7c3e118e1ee647adacef00fffc7dd1644a60c | |
| parent | 8b8ffb777cd2881646b02722b74ec9e15475a18e (diff) | |
| download | ATCD-70fa417394cdd488af43666d0e4e03bcb7ab90a6.tar.gz | |
ChangeLogTag:Sat Apr 23 08:20:11 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/CIAO/ChangeLog | 1 | ||||
| -rw-r--r-- | ace/Log_Msg.cpp | 12 |
3 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 181e7c8c60c..b20c4f932b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ Sat Apr 23 08:20:11 2005 Ossama Othman <ossama@dre.vanderbilt.edu> Fixed "possible loss of data" VC++ 7.1 warnings. +Fri Apr 22 18:02:37 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu> + + * ace/Log_Msg.cpp (open): Fixed a problem with LOGGER and logger_key + and the backend_->open() call. Thanks to Jerry D. De Master + <jdemaste at rite-solutions dot com> for reporting this. + Fri Apr 22 22:45:35 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * apps/JAWS3/jaws3/Event_Completer.h (~JAWS_Event_Completer): diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 18f30bb346f..9dd483f0324 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -81,6 +81,7 @@ Wed Apr 20 13:05:23 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu> Fixed compile errors in Borland. Wed Apr 20 08:09:17 CDT 2005 Will Otte <wotte@dre.vanderbilt.edu> + * DAnCE/ciao/Servant_Impl_T.cpp Fixed a compile error with emulated exceptions. diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index ff7e208baee..a0a0e846cfd 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -786,13 +786,15 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name, { // The SYSLOG backends (both NT and UNIX) can get along fine // without the logger_key. - if (logger_key == 0 && ACE_BIT_ENABLED (flags, ACE_Log_Msg::LOGGER)) - status = -1; - else + if (ACE_BIT_ENABLED (flags, ACE_Log_Msg::LOGGER)) { - status = - ACE_Log_Msg_Manager::log_backend_->open (prog_name); + if (logger_key == 0) + status = -1; + else + status = ACE_Log_Msg_Manager::log_backend_->open (logger_key); } + else + status = ACE_Log_Msg_Manager::log_backend_->open (prog_name); if (status == -1) ACE_SET_BITS (ACE_Log_Msg::flags_, ACE_Log_Msg::STDERR); |