diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-13 03:33:21 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-13 03:33:21 +0000 |
| commit | 95dd3071d3435c77cb0af701ebb99b3e185e91e0 (patch) | |
| tree | c003022cb8daabfe60f9adaef5ba5ddcfe25d97f | |
| parent | dd2566a3d84a18d4edb3fd83bc9542c4c5a7c7f7 (diff) | |
| download | ATCD-95dd3071d3435c77cb0af701ebb99b3e185e91e0.tar.gz | |
ChangeLogTag:Thu Jul 12 20:29:42 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.i | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 9656a690b9f..8ae7c34bbed 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Thu Jul 12 20:29:42 2001 Ossama Othman <ossama@uci.edu> + + * tao/ORB_Core.i (resolve_rt_orb, resolve_rt_current): + + Fixed broken emulated exception code. ACE_CHECK_RETURN should + have been used instead of ACE_TRY_FLAG. + Thu Jul 12 20:21:36 2001 Ossama Othman <ossama@uci.edu> * docs/tutorials/Quoter/Makefile (DIRS): diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 4cfee1e240d..c06290ef6ed 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -556,7 +556,7 @@ TAO_ORB_Core::resolve_rt_orb (CORBA::Environment &ACE_TRY_ENV) this->object_ref_table ().resolve_initial_references ( TAO_OBJID_RTORB, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (CORBA::Object::_nil ()); } } @@ -577,7 +577,7 @@ TAO_ORB_Core::resolve_rt_current (CORBA::Environment &ACE_TRY_ENV) this->object_ref_table ().resolve_initial_references ( TAO_OBJID_RTCURRENT, ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK_RETURN (CORBA::Object::_nil ()); } } return CORBA::Object::_duplicate (this->rt_current_.in ()); |