diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-11 22:32:46 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-11 22:32:46 +0000 |
| commit | 803c7dceaf69b546b6fd9397910433dccbd8c178 (patch) | |
| tree | 7c6365d07aeb12bb8164a5ffbffe4aff84030012 /TAO/tao/CurrentC.cpp | |
| parent | 8209476b6ead1d9f4a62f28ccb589434508af379 (diff) | |
| download | ATCD-803c7dceaf69b546b6fd9397910433dccbd8c178.tar.gz | |
ChangeLogTag:Sun Oct 11 17:09:16 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao/CurrentC.cpp')
| -rw-r--r-- | TAO/tao/CurrentC.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 228dacccfc6..13eb07e45a2 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -32,19 +32,15 @@ CORBA_Current_ptr CORBA_Current::_narrow ( return CORBA_Current::_nil (); if (!obj->_is_a ("IDL:CORBA/Current:1.0", env)) return CORBA_Current::_nil (); + STUB_Object *stub = obj->_stubobj (); + stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant() || obj->_servant()->_downcast ("IDL:CORBA/Current:1.0") == 0 ) { - STUB_Object *stub = obj->_stubobj (); - stub->_incr_refcnt (); - CORBA_Current_ptr new_obj = new CORBA_Current(stub); - return new_obj; - } // end of if - STUB_Object *stub = obj->_servant ()->_create_stub (env); - if (env.exception () != 0) - return CORBA_Current::_nil (); + return new CORBA_Current(stub); + } void* servant = obj->_servant ()->_downcast ("IDL:CORBA/Current:1.0"); return new POA_CORBA::_tao_collocated_Current( ACE_reinterpret_cast(POA_CORBA::Current_ptr, servant), |