diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-05-11 20:21:06 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-05-11 20:21:06 +0000 |
| commit | 374b3f6840c4e9a20b588104ee1047de5610ce03 (patch) | |
| tree | 704d60eaa35a789592d74d0aa1ad0853e5319b5c | |
| parent | 1fc803f5848357cb5bc5a4ce158780d2b1bc89e8 (diff) | |
| download | ATCD-374b3f6840c4e9a20b588104ee1047de5610ce03.tar.gz | |
ChangeLogTag:Fri May 11 10:25:00 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 3 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 3 | ||||
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp | 27 | ||||
| -rw-r--r-- | ace/OS_Dirent.h | 2 |
6 files changed, 29 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog index 960d2c4c80c..b9b966d99b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Fri May 11 10:25:00 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * ace/OS_Dirent.h (ACE_OS_Dirent): Missed a conversion of "DIR" to + "ACE_DIR". + * ace/Synch.cpp (get_nesting_level): Added better protection for the case where ACE_HAS_RECURSIVE_MUTEXES -- only return RecursionCount if ACE_WIN32 is defined. Thanks to Corey Trager diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 960d2c4c80c..b9b966d99b3 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,5 +1,8 @@ Fri May 11 10:25:00 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * ace/OS_Dirent.h (ACE_OS_Dirent): Missed a conversion of "DIR" to + "ACE_DIR". + * ace/Synch.cpp (get_nesting_level): Added better protection for the case where ACE_HAS_RECURSIVE_MUTEXES -- only return RecursionCount if ACE_WIN32 is defined. Thanks to Corey Trager diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 960d2c4c80c..b9b966d99b3 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,5 +1,8 @@ Fri May 11 10:25:00 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + * ace/OS_Dirent.h (ACE_OS_Dirent): Missed a conversion of "DIR" to + "ACE_DIR". + * ace/Synch.cpp (get_nesting_level): Added better protection for the case where ACE_HAS_RECURSIVE_MUTEXES -- only return RecursionCount if ACE_WIN32 is defined. Thanks to Corey Trager diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 081324c956b..6d41f3d9614 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Fri May 11 15:09:32 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * orbsvcs/ImplRepo_Service/tao_imr_i.cpp (run): Make the + code more robust for invalid IORs. Thanks to John Ashmum + <John.ASHMUN@esca.com> for reporting this. + Fri May 11 12:13:42 2001 Balachandran Natarajan <bala@cs.wustl.edu> * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp: diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp index 887d2921ba2..68d03597d0b 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp @@ -764,23 +764,22 @@ TAO_IMR_Op_IOR::run (void) char *pos = ACE_OS::strstr (imr_str.inout (), "://"); - pos = - ACE_OS::strchr ( - pos + 3, - this->implrepo_->_stubobj ()->profile_in_use ()->object_key_delimiter () - ); - - if (pos) - { - *(pos + 1) = 0; // Crop the string - } + if (pos == 0) + ACE_ERROR_RETURN ((LM_ERROR, + "Could not parse IMR IOR\n"), + -1); else { - ACE_ERROR_RETURN ((LM_ERROR, - "Could not parse IMR IOR\n"), - -1); + pos = ACE_OS::strchr (pos + 3, + this->implrepo_->_stubobj ()->profile_in_use ()->object_key_delimiter ()); + + if (pos) + *(pos + 1) = 0; // Crop the string + else + ACE_ERROR_RETURN ((LM_ERROR, + "Could not parse IMR IOR\n"), + -1); } - ACE_TString ior (imr_str.in ()); // Add the key diff --git a/ace/OS_Dirent.h b/ace/OS_Dirent.h index 8471267d8f2..749eb52ac94 100644 --- a/ace/OS_Dirent.h +++ b/ace/OS_Dirent.h @@ -97,7 +97,7 @@ public: private: // Win32 emulation functions - static DIR *opendir_emulation (const ACE_TCHAR *filename); + static ACE_DIR *opendir_emulation (const ACE_TCHAR *filename); static void closedir_emulation (ACE_DIR *); static struct dirent *readdir_emulation (ACE_DIR *); }; |