diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-19 21:58:49 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-08-19 21:58:49 +0000 |
| commit | 9150dad49261ed1a4476ba88b1d1c44b6b8b3655 (patch) | |
| tree | d1fbc998910c584557c0b451b01e6b9671ca2d89 | |
| parent | a4c5c2105ffe6928b23d4c27c24f6364b04e7ad4 (diff) | |
| download | ATCD-9150dad49261ed1a4476ba88b1d1c44b6b8b3655.tar.gz | |
ChangeLogTag:Sun Aug 19 13:41:07 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | TAO/tests/DLL_ORB/Test_i.cpp | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index c4483083b00..15368f94029 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Sun Aug 19 13:41:07 2001 Ossama Othman <ossama@uci.edu> + + * tests/DLL_ORB/Test_i.cpp (shutdown): + + Do not wait for completion when shutting down the ORB since + ORB::shutdown() is being called in the context of an upcall. + Thanks to Craig Rodrigues <crodrigu@bbn.com> for finding the + problem and providing the fix. + Sat Aug 18 08:59:32 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tao/ORBInitInfo.cpp: Fixed a compiler error in the static diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp index ceba9209f37..a385bba01e1 100644 --- a/TAO/tests/DLL_ORB/Test_i.cpp +++ b/TAO/tests/DLL_ORB/Test_i.cpp @@ -27,7 +27,7 @@ Test_i::shutdown (CORBA::Environment &ACE_TRY_ENV) "Server is shutting down.\n")); if (!CORBA::is_nil (this->orb_.in ())) - this->orb_->shutdown (1, ACE_TRY_ENV); + this->orb_->shutdown (0, ACE_TRY_ENV); } void |