diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-24 04:43:59 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-24 04:43:59 +0000 |
| commit | e734c1d9923c66dc191d825dd1cdb79d6c15f5f1 (patch) | |
| tree | ee03afe97556edc859fb1fbfa966bf75229e87aa /TAO/tao | |
| parent | 9648d43c4d91407a37f7d6e75e948b807a0700b0 (diff) | |
| download | ATCD-e734c1d9923c66dc191d825dd1cdb79d6c15f5f1.tar.gz | |
ChangeLogTag:Tue Mar 23 22:33:43 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'TAO/tao')
45 files changed, 314 insertions, 301 deletions
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h index 9867cb507c3..916ef0bbac9 100644 --- a/TAO/tao/Any.h +++ b/TAO/tao/Any.h @@ -312,7 +312,7 @@ private: void operator<<= (unsigned char); CORBA::Boolean operator>>= (unsigned char&) const; - friend class STUB_Object; + friend class TAO_Stub; friend class TAO_Marshal_Any; friend class CORBA_NVList; }; diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp index e55b2394ef2..efd760210de 100644 --- a/TAO/tao/Connect.cpp +++ b/TAO/tao/Connect.cpp @@ -688,8 +688,8 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE) default: // Unknown message ACE_DEBUG ((LM_DEBUG, "(%P|%t) Illegal message received by server\n")); - ACE_TRY_ENV.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO)); - // FALLTHROUGH + ACE_TRY_THROW (CORBA::COMM_FAILURE (CORBA::COMPLETED_NO)); + // NOTREACHED case TAO_GIOP::CommunicationError: case TAO_GIOP::MessageError: @@ -729,7 +729,13 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE) ACE_CATCHALL { // @@ TODO some c++ exception or another, but what do we do with - // it? BTW, this cannot be detected if using the <env> mapping. + // it? + // We are supposed to map it into a CORBA::UNKNOWN exception. + // BTW, this cannot be detected if using the <env> mapping. + // If we have native exceptions but no support for them + // in the ORB we should still be able to catch it. + // If we don't have native exceptions it couldn't have been + // raised in the first place! ACE_ERROR ((LM_ERROR, "(%P|%t) closing conn %d after fault %p\n", @@ -774,7 +780,8 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE) return result; } -// @@ For pluggable protocols, added a reference to the corresponding transport obj. +// @@ For pluggable protocols, added a reference to the corresponding +// transport obj. TAO_Client_Connection_Handler::TAO_Client_Connection_Handler (ACE_Thread_Manager *t) : TAO_IIOP_Handler_Base (t == 0 ? TAO_ORB_Core_instance ()->thr_mgr () : t), expecting_response_ (0), @@ -908,11 +915,13 @@ TAO_Client_Connection_Handler::check_unexpected_data (void) // 0 is a graceful shutdown // -1 is a somewhat ugly shutdown // - // Both will result in us returning -1 and this connection getting closed + // Both will result in us returning -1 and this connection + // getting closed // if (TAO_orbdebug) ACE_DEBUG ((LM_WARNING, - "Client_Connection_Handler::handle_input: closing connection on fd %d\n", + "Client_Connection_Handler::handle_input: " + "closing connection on fd %d\n", this->peer().get_handle ())); break; @@ -924,7 +933,8 @@ TAO_Client_Connection_Handler::check_unexpected_data (void) // handle this yet, log an error, and close the connection. ACE_ERROR ((LM_WARNING, "Client_Connection_Handler::handle_input received " - "input while not expecting a response; closing connection on fd %d\n", + "input while not expecting a response; " + "closing connection on fd %d\n", this->peer().get_handle ())); break; } diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp index 0f85e0949e2..806197250e0 100644 --- a/TAO/tao/CurrentC.cpp +++ b/TAO/tao/CurrentC.cpp @@ -38,7 +38,7 @@ 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 (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant() diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h index b06716fd16c..065c65cf8e1 100644 --- a/TAO/tao/CurrentC.h +++ b/TAO/tao/CurrentC.h @@ -123,7 +123,7 @@ class CORBA_Current : public virtual ACE_CORBA_1 (Object) virtual const char* _interface_repository_id (void) const; protected: CORBA_Current (void); // default constructor - CORBA_Current (STUB_Object *objref, + CORBA_Current (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i index 2040384c0b8..e4232c052e2 100644 --- a/TAO/tao/CurrentC.i +++ b/TAO/tao/CurrentC.i @@ -12,7 +12,7 @@ CORBA_Current::CORBA_Current (void) // default constructor {} ACE_INLINE -CORBA_Current::CORBA_Current (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor +CORBA_Current::CORBA_Current (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor : CORBA_Object (objref, _tao_servant, _tao_collocated) {} diff --git a/TAO/tao/CurrentS.cpp b/TAO/tao/CurrentS.cpp index 2b46102aded..21c556940be 100644 --- a/TAO/tao/CurrentS.cpp +++ b/TAO/tao/CurrentS.cpp @@ -115,7 +115,7 @@ const char* POA_CORBA::Current::_interface_repository_id (void) const POA_CORBA::_tao_collocated_Current::_tao_collocated_Current ( POA_CORBA::Current_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : CORBA_Current (stub, servant, 1), CORBA_Object (stub, servant, 1), @@ -143,7 +143,7 @@ CORBA::Boolean POA_CORBA::_tao_collocated_Current::_is_a ( CORBA::Current* POA_CORBA::Current::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_CORBA::_tao_collocated_Current (this, stub); diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp index 7f565c8aac6..9f9ca33ae4e 100644 --- a/TAO/tao/DynAnyC.cpp +++ b/TAO/tao/DynAnyC.cpp @@ -52,7 +52,7 @@ CORBA_DynAny_ptr CORBA_DynAny::_narrow (CORBA::Object_ptr obj, if (!obj->_is_a ("IDL:/CORBA_DynAny:1.0", env)) return CORBA_DynAny::_nil (); - STUB_Object* stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant () @@ -712,7 +712,7 @@ CORBA_DynEnum_ptr CORBA_DynEnum::_narrow (CORBA::Object_ptr obj, if (!obj->_is_a ("IDL:/CORBA_DynEnum:1.0", env)) return CORBA_DynEnum::_nil (); - STUB_Object* stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant () @@ -1007,7 +1007,7 @@ CORBA_DynStruct_ptr CORBA_DynStruct::_narrow (CORBA::Object_ptr obj, if (!obj->_is_a ("IDL:/CORBA_DynStruct:1.0", env)) return CORBA_DynStruct::_nil (); - STUB_Object* stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant () @@ -1116,7 +1116,7 @@ CORBA_DynUnion_ptr CORBA_DynUnion::_narrow (CORBA::Object_ptr obj, env)) return CORBA_DynUnion::_nil (); - STUB_Object* stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant () @@ -1326,7 +1326,7 @@ CORBA_DynSequence_ptr CORBA_DynSequence::_narrow (CORBA::Object_ptr obj, env)) return CORBA_DynSequence::_nil (); - STUB_Object* stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant () @@ -1435,7 +1435,7 @@ CORBA_DynArray_ptr CORBA_DynArray::_narrow (CORBA::Object_ptr obj, env)) return CORBA_DynArray::_nil (); - STUB_Object* stub = obj->_stubobj (); + TAO_Stub* stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant () diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h index 13063c7ca28..713a7568acc 100644 --- a/TAO/tao/DynAnyC.h +++ b/TAO/tao/DynAnyC.h @@ -474,7 +474,7 @@ public: virtual const char* _interface_repository_id (void) const; protected: CORBA_DynAny (void); // default constructor - CORBA_DynAny (STUB_Object *objref, + CORBA_DynAny (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); @@ -601,7 +601,7 @@ public: virtual const char* _interface_repository_id (void) const; protected: CORBA_DynEnum (void); // default constructor - CORBA_DynEnum (STUB_Object *objref, + CORBA_DynEnum (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); @@ -1076,7 +1076,7 @@ public: virtual const char* _interface_repository_id (void) const; protected: CORBA_DynStruct (void); // default constructor - CORBA_DynStruct (STUB_Object *objref, + CORBA_DynStruct (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); @@ -1219,7 +1219,7 @@ public: virtual const char* _interface_repository_id (void) const; protected: CORBA_DynUnion (void); // default constructor - CORBA_DynUnion (STUB_Object *objref, + CORBA_DynUnion (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); @@ -1637,7 +1637,7 @@ public: virtual const char* _interface_repository_id (void) const; protected: CORBA_DynSequence (void); // default constructor - CORBA_DynSequence (STUB_Object *objref, + CORBA_DynSequence (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); @@ -1755,7 +1755,7 @@ public: virtual const char* _interface_repository_id (void) const; protected: CORBA_DynArray (void); // default constructor - CORBA_DynArray (STUB_Object *objref, + CORBA_DynArray (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); diff --git a/TAO/tao/DynAnyC.i b/TAO/tao/DynAnyC.i index 8ba97ca7955..d9f0423cba5 100644 --- a/TAO/tao/DynAnyC.i +++ b/TAO/tao/DynAnyC.i @@ -27,7 +27,7 @@ CORBA_DynAny::CORBA_DynAny (void) // default constructor {} ACE_INLINE -CORBA_DynAny::CORBA_DynAny (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor +CORBA_DynAny::CORBA_DynAny (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor : CORBA_Object (objref, _tao_servant, _tao_collocated) {} @@ -230,7 +230,7 @@ CORBA_DynEnum::CORBA_DynEnum (void) // default constructor {} ACE_INLINE -CORBA_DynEnum::CORBA_DynEnum (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor +CORBA_DynEnum::CORBA_DynEnum (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor : CORBA_Object (objref, _tao_servant, _tao_collocated) {} @@ -767,7 +767,7 @@ CORBA_DynStruct::CORBA_DynStruct (void) // default constructor {} ACE_INLINE -CORBA_DynStruct::CORBA_DynStruct (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor +CORBA_DynStruct::CORBA_DynStruct (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor : CORBA_Object (objref, _tao_servant, _tao_collocated) {} @@ -954,7 +954,7 @@ CORBA_DynUnion::CORBA_DynUnion (void) // default constructor {} ACE_INLINE -CORBA_DynUnion::CORBA_DynUnion (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor +CORBA_DynUnion::CORBA_DynUnion (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor : CORBA_Object (objref, _tao_servant, _tao_collocated) {} @@ -1322,7 +1322,7 @@ CORBA_DynSequence::CORBA_DynSequence (void) // default constructor {} ACE_INLINE -CORBA_DynSequence::CORBA_DynSequence (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor +CORBA_DynSequence::CORBA_DynSequence (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor : CORBA_Object (objref, _tao_servant, _tao_collocated) {} @@ -1509,7 +1509,7 @@ CORBA_DynArray::CORBA_DynArray (void) // default constructor {} ACE_INLINE -CORBA_DynArray::CORBA_DynArray (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor +CORBA_DynArray::CORBA_DynArray (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor : CORBA_Object (objref, _tao_servant, _tao_collocated) {} diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp index 5684075d2d1..628cf963f29 100644 --- a/TAO/tao/DynAnyS.cpp +++ b/TAO/tao/DynAnyS.cpp @@ -85,7 +85,7 @@ POA_CORBA::DynAny::_interface_repository_id (void) const POA_CORBA::_tao_collocated_DynAny::_tao_collocated_DynAny ( POA_CORBA::DynAny_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : CORBA_DynAny (), CORBA_Object (stub, @@ -575,7 +575,7 @@ POA_CORBA::_tao_collocated_DynAny::rewind ( CORBA_DynAny* POA_CORBA::DynAny::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; @@ -653,7 +653,7 @@ POA_CORBA::DynEnum::_interface_repository_id (void) const POA_CORBA::_tao_collocated_DynEnum::_tao_collocated_DynEnum ( POA_CORBA::DynEnum_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : CORBA_DynEnum (), _tao_collocated_DynAny (servant, @@ -731,7 +731,7 @@ POA_CORBA::_tao_collocated_DynEnum::value_as_ulong ( CORBA_DynEnum* POA_CORBA::DynEnum::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; @@ -806,7 +806,7 @@ POA_CORBA::DynStruct::_interface_repository_id (void) const POA_CORBA::_tao_collocated_DynStruct::_tao_collocated_DynStruct ( POA_CORBA::DynStruct_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : CORBA_DynStruct (), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant, @@ -882,7 +882,7 @@ POA_CORBA::_tao_collocated_DynStruct::set_members ( CORBA_DynStruct* POA_CORBA::DynStruct::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; @@ -955,7 +955,7 @@ const char* POA_CORBA::DynUnion::_interface_repository_id (void) const POA_CORBA::_tao_collocated_DynUnion::_tao_collocated_DynUnion ( POA_CORBA::DynUnion_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : CORBA_DynUnion (), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant, @@ -1071,7 +1071,7 @@ POA_CORBA::_tao_collocated_DynUnion::member_kind ( CORBA_DynUnion* POA_CORBA::DynUnion::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; @@ -1146,7 +1146,7 @@ POA_CORBA::DynSequence::_interface_repository_id (void) const POA_CORBA::_tao_collocated_DynSequence::_tao_collocated_DynSequence ( POA_CORBA::DynSequence_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : CORBA_DynSequence (), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant, @@ -1222,7 +1222,7 @@ POA_CORBA::_tao_collocated_DynSequence::set_elements ( CORBA_DynSequence* POA_CORBA::DynSequence::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; @@ -1297,7 +1297,7 @@ POA_CORBA::DynArray::_interface_repository_id (void) const POA_CORBA::_tao_collocated_DynArray::_tao_collocated_DynArray ( POA_CORBA::DynArray_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : CORBA_DynArray (), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant, @@ -1350,7 +1350,7 @@ POA_CORBA::_tao_collocated_DynArray::set_elements ( CORBA_DynArray* POA_CORBA::DynArray::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 90f54150d1b..86a3b92700e 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -423,7 +423,10 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp, TAO_SYSTEM_EXCEPTION (INTF_REPOS) \ TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \ TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \ - TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) + TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \ + TAO_SYSTEM_EXCEPTION (INV_POLICY) \ + TAO_SYSTEM_EXCEPTION (REBIND) \ + TAO_SYSTEM_EXCEPTION (TIMEOUT) // Declare static storage for these ... the buffer is "naturally" // aligned and overwritten. diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 9a47fcb4cf8..33edab34a5a 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -228,6 +228,9 @@ TAO_SYSTEM_EXCEPTION(INTF_REPOS); TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); +TAO_SYSTEM_EXCEPTION(INV_POLICY); +TAO_SYSTEM_EXCEPTION(REBIND); +TAO_SYSTEM_EXCEPTION(TIMEOUT); #undef TAO_SYSTEM_EXCEPTION diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp index 6fd09a9f9ec..94a944b424c 100644 --- a/TAO/tao/IIOP_ORB.cpp +++ b/TAO/tao/IIOP_ORB.cpp @@ -195,10 +195,10 @@ iiop_string_to_object (const char *string, CORBA::Object::_nil ()); // pfile refcount == 1 - // Now make the STUB_Object ... - STUB_Object *data; + // Now make the TAO_Stub ... + TAO_Stub *data; ACE_NEW_RETURN (data, - STUB_Object ((char *) 0, + TAO_Stub ((char *) 0, pfile), CORBA::Object::_nil ()); // pfile refcount == 2 @@ -280,10 +280,10 @@ iioploc_string_to_object (const char *string, mp->give_profile (pfile); } - // Now make the STUB_Object ... - STUB_Object *data; + // Now make the TAO_Stub ... + TAO_Stub *data; ACE_NEW_RETURN (data, - STUB_Object ((char *) 0, + TAO_Stub ((char *) 0, mp), CORBA::Object::_nil ()); @@ -343,7 +343,7 @@ IIOP_ORB::string_to_object (const char *str, } TAO_ServantBase * -IIOP_ORB::_get_collocated_servant (STUB_Object *sobj) +IIOP_ORB::_get_collocated_servant (TAO_Stub *sobj) { // ACE_DEBUG ((LM_DEBUG, "IIOP_ORB: get_collocated_servant\n")); @@ -352,7 +352,7 @@ IIOP_ORB::_get_collocated_servant (STUB_Object *sobj) TAO_Profile *pfile = sobj->profile_in_use (); - // Make sure users passed in a valid STUB_Object otherwise, we + // Make sure users passed in a valid TAO_Stub otherwise, we // don't know what to do next. if (pfile == 0) { diff --git a/TAO/tao/IIOP_ORB.h b/TAO/tao/IIOP_ORB.h index a31be32f51c..f7ecb37ebed 100644 --- a/TAO/tao/IIOP_ORB.h +++ b/TAO/tao/IIOP_ORB.h @@ -54,7 +54,7 @@ public: int _tao_find_in_IOR_table (ACE_CString object_id, CORBA::Object_ptr &obj); // Find the given ObjectID in the table. - TAO_ServantBase *_get_collocated_servant (STUB_Object *sobj); + TAO_ServantBase *_get_collocated_servant (TAO_Stub *sobj); // Return the object pointer of an collocated object it there is // one, otherwise, return 0. diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 64a782561ee..1ed766d0300 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -385,7 +385,7 @@ TAO_IIOP_Profile::parse (TAO_InputCDR& cdr, int TAO_IIOP_Profile::parse_string (const char *string, - CORBA::Environment &env) + CORBA::Environment &ACE_TRY_ENV) { if (!string || !*string) return 0; @@ -406,18 +406,12 @@ TAO_IIOP_Profile::parse_string (const char *string, string += 5; } else - // @@ AFAIK the right kind of exception to raise here is - // CORBA_MARSHAL: CORBA_DATA_CONVERSION is reserved for failure - // to translate *values* (such as character set mismatches, - // fixed<> types, floats, etc.) - env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), 0); if (this->version_.major != TAO_IIOP_Profile::DEF_IIOP_MAJOR || this->version_.minor > TAO_IIOP_Profile::DEF_IIOP_MINOR) { - // @@ Same thing here.... - env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); - return -1; + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); } // Pull off the "hostname:port/" part of the objref @@ -428,9 +422,8 @@ TAO_IIOP_Profile::parse_string (const char *string, char *cp = ACE_OS::strchr (start, ':'); if (cp == 0) - { - env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); - return -1; + { + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); } if (this->host_) @@ -458,9 +451,8 @@ TAO_IIOP_Profile::parse_string (const char *string, if (cp == 0) { - env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO)); CORBA::string_free (this->host_); - return -1; + ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); } this->port_ = (CORBA::UShort) ACE_OS::atoi (start); diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index e7e1031a696..fd19485287f 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -62,10 +62,10 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Invocation_Timeprobe_Description, // call. That is less disruptive (and error prone) in general than // restructuring an ORB core in terms of asynchrony. -TAO_GIOP_Invocation::TAO_GIOP_Invocation (STUB_Object *data, +TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub, const char *operation, TAO_ORB_Core* orb_core) - : data_ (data), + : stub_ (stub), opname_ (operation), my_request_id_ (0), out_stream_ (buffer, sizeof buffer, /* ACE_CDR::DEFAULT_BUFSIZE */ @@ -130,9 +130,9 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, // @@ assert is evil, it crashes the program, changed to an // exception (coryan) - // assert (this->data_ != 0); + // assert (this->stub_ != 0); - if (this->data_ == 0) + if (this->stub_ == 0) ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO)); // Get a pointer to the connector registry, which might be in @@ -158,17 +158,17 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, for (;;) { // Get the current profile... - this->profile_ = this->data_->profile_in_use (); + this->profile_ = this->stub_->profile_in_use (); if (this->transport_ != 0) this->transport_->idle (); - int result = conn_reg->connect (this->data_, this->transport_); + int result = conn_reg->connect (this->stub_, this->transport_); if (result == 0) break; // Try moving to the next profile and starting over, if that // fails then we must raise the TRANSIENT exception. - if (this->data_->next_profile_retry () == 0) + if (this->stub_->next_profile_retry () == 0) ACE_THROW (CORBA::TRANSIENT (CORBA::COMPLETED_NO)); } @@ -354,7 +354,7 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip, // @@ Maybe the right place to do this is once the reply is // received? But what about oneways? - this->data_->set_valid_profile (); + this->stub_->set_valid_profile (); return TAO_INVOKE_OK; } @@ -385,7 +385,7 @@ TAO_GIOP_Invocation::close_connection (void) // the profile list to point to the first profile! // FRED For now we will not deal with recursive forwards! - this->data_->reset_profiles (); + this->stub_->reset_profiles (); // sets the forwarding profile to 0 and deletes the old one; // rewinds the profiles list back to the first one. @@ -394,7 +394,7 @@ TAO_GIOP_Invocation::close_connection (void) // Handle the GIOP Reply with status = LOCATION_FORWARD // Replace the IIOP Profile. The call is then automatically -// reinvoked by the STUB_Object::do_static_call method. +// reinvoked by the TAO_Stub::do_static_call method. int TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, @@ -420,10 +420,10 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, TAO_INVOKE_EXCEPTION); } - // The object pointer has to be changed to a STUB_Object pointer + // The object pointer has to be changed to a TAO_Stub pointer // in order to extract the profile. - STUB_Object *stubobj = object->_stubobj (); + TAO_Stub *stubobj = object->_stubobj (); if (stubobj == 0) { @@ -450,11 +450,11 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // New for Multiple profile. Get the MProfile list from the // forwarded object refererence - this->data_->add_forward_profiles (stubobj->get_profiles ()); + this->stub_->add_forward_profiles (stubobj->get_profiles ()); // store the new profile list and set the first forwarding profile // note: this has to be and is thread safe. Also get_profiles returns - // a pointer to a new MProfile object which we give to data_ (Our - // STUB_Object.) + // a pointer to a new MProfile object which we give to our + // TAO_Stub. // @@ Why do we clear the environment? // ACE_TRY_ENV.clear (); @@ -462,7 +462,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // We may not need to do this since TAO_GIOP_Invocations // get created on a per-call basis. For now we'll play it safe. - if (this->data_->next_profile () == 0) + if (this->stub_->next_profile () == 0) ACE_THROW_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_NO), TAO_INVOKE_EXCEPTION); @@ -731,7 +731,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) // semantics of CORBA we must raise an exception at this point // and *not* try to transparently restart the request. - // We must also reset the state of this object, because the next + // We must also reset the state of this object, because the next // invocation may perfectly work. this->close_connection (); @@ -922,7 +922,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) // @@ Maybe the right place to do this is once the reply is // received? But what about oneways? - this->data_->set_valid_profile (); + this->stub_->set_valid_profile (); TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (this->transport_, this->inp_stream_, diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h index 29ec5ffa031..90900bed917 100644 --- a/TAO/tao/Invocation.h +++ b/TAO/tao/Invocation.h @@ -62,7 +62,7 @@ class TAO_Export TAO_GIOP_Invocation // public: // = Initialization and termination methods. - TAO_GIOP_Invocation (STUB_Object *data, + TAO_GIOP_Invocation (TAO_Stub *data, const char *operation, TAO_ORB_Core* orb_core); ~TAO_GIOP_Invocation (void); @@ -145,7 +145,7 @@ private: // weight version. protected: - STUB_Object *data_; + TAO_Stub *stub_; // The object on which this invocation is going. const char *opname_; @@ -184,7 +184,7 @@ class TAO_Export TAO_GIOP_Twoway_Invocation : public TAO_GIOP_Invocation // public: // = Initialization and termination methods. - TAO_GIOP_Twoway_Invocation (STUB_Object *data, + TAO_GIOP_Twoway_Invocation (TAO_Stub *data, const char *operation, TAO_ORB_Core* orb_core); @@ -237,7 +237,7 @@ class TAO_Export TAO_GIOP_Oneway_Invocation : public TAO_GIOP_Invocation // public: // = Initialization and termination methods. - TAO_GIOP_Oneway_Invocation (STUB_Object *data, + TAO_GIOP_Oneway_Invocation (TAO_Stub *data, const char *operation, TAO_ORB_Core* orb_core); @@ -260,7 +260,7 @@ class TAO_Export TAO_GIOP_Locate_Request_Invocation : public TAO_GIOP_Invocation // public: // = Initialization and termination methods. - TAO_GIOP_Locate_Request_Invocation (STUB_Object *data, + TAO_GIOP_Locate_Request_Invocation (TAO_Stub *data, TAO_ORB_Core* orb_core); void start (CORBA_Environment &TAO_IN_ENV = diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i index 74e5f6f7cd9..2005ef3d04e 100644 --- a/TAO/tao/Invocation.i +++ b/TAO/tao/Invocation.i @@ -21,10 +21,10 @@ TAO_GIOP_Invocation::out_stream (void) ACE_INLINE TAO_GIOP_Twoway_Invocation:: -TAO_GIOP_Twoway_Invocation (STUB_Object *data, +TAO_GIOP_Twoway_Invocation (TAO_Stub *stub, const char *operation, TAO_ORB_Core *orb_core) - : TAO_GIOP_Invocation (data, operation, orb_core), + : TAO_GIOP_Invocation (stub, operation, orb_core), inp_stream_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE), TAO_ENCAP_BYTE_ORDER) { @@ -55,10 +55,10 @@ TAO_GIOP_Twoway_Invocation::inp_stream (void) ACE_INLINE TAO_GIOP_Oneway_Invocation:: -TAO_GIOP_Oneway_Invocation (STUB_Object *data, +TAO_GIOP_Oneway_Invocation (TAO_Stub *stub, const char *operation, TAO_ORB_Core *orb_core) - : TAO_GIOP_Invocation (data, operation, orb_core) + : TAO_GIOP_Invocation (stub, operation, orb_core) { } @@ -80,9 +80,9 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE TAO_GIOP_Locate_Request_Invocation:: -TAO_GIOP_Locate_Request_Invocation (STUB_Object *data, +TAO_GIOP_Locate_Request_Invocation (TAO_Stub *stub, TAO_ORB_Core *orb_core) - : TAO_GIOP_Invocation (data, 0, orb_core), + : TAO_GIOP_Invocation (stub, 0, orb_core), inp_stream_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE)) { } diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index 4f44e2c43d7..2248e27cc04 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -37,8 +37,8 @@ class TAO_Export TAO_MProfile // a linear array of profiles. // // It is assumed that locking will only be required when a profile - // list is associated with a STUB_Object. Thus when the - // STUB_Object accepts ownership of an MProfile it also assumes + // list is associated with a TAO_Stub. Thus when the + // TAO_Stub accepts ownership of an MProfile it also assumes // responsibility for controling access (i.e. locking). public: // = Initalization and termination methods. diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 4efaf110392..3f692d09ff5 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -874,7 +874,7 @@ CORBA_ORB::resolve_initial_references (CORBA::String name, } -STUB_Object * +TAO_Stub * CORBA_ORB::create_stub_object (const TAO_ObjectKey &key, const char *type_id, CORBA::Environment &env) @@ -905,9 +905,9 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key, orb_core->orb_params ()->addr ().get_port_number (), key, TAO_ORB_Core_instance ()->orb_params ()->addr ()); - STUB_Object *data = 0; + TAO_Stub *data = 0; // @@ replace IIOP::Profile with something more appropriate!! - data = new STUB_Object (id, pfile); + data = new TAO_Stub (id, pfile); if (pfile == 0) { @@ -922,8 +922,8 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key, // Plus we want to return an exception. @@ If that's the only // reason, then you can use ACE_NEW_THROW_RETURN. - data = new STUB_Object (id, pfile); - // pfile is given to STUB_Object! + data = new TAO_Stub (id, pfile); + // pfile is given to TAO_Stub! if (data == 0) env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); @@ -939,7 +939,7 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key, const char *type_id, CORBA::Environment &env) { - STUB_Object *data = this->create_stub_object (key, type_id, env); + TAO_Stub *data = this->create_stub_object (key, type_id, env); if (env.exception () != 0) return CORBA::Object::_nil (); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 5e8b8f6c486..473ac2eb6e3 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -89,7 +89,7 @@ typedef struct TAO_Leader_Follower_Info_Struct // thread ID of the leader thread (protected) } TAO_Leader_Follower_Info; -class STUB_Object; +class TAO_Stub; // Forward declarations. class TAO_Export CORBA_String_var @@ -244,11 +244,11 @@ public: // this is typically eventually given to <string_to_object()> as an // argument. - virtual TAO_ServantBase *_get_collocated_servant (STUB_Object *p) = 0; + virtual TAO_ServantBase *_get_collocated_servant (TAO_Stub *p) = 0; // Return the object pointer of an collocated object it there is // one, otherwise, return 0. Each type of ORB, e. g., IIOP ORB, // must implement this and determine what is a collocated object - // based on information provided in the STUB_Object. + // based on information provided in the TAO_Stub. virtual int _tao_add_to_IOR_table (ACE_CString object_id, CORBA::Object_ptr obj) = 0; // Add a mapping ObjectID->IOR to the table. @@ -329,7 +329,7 @@ public: const TAO_POA_Policies *policies = 0); // Resolve the POA. - STUB_Object *create_stub_object (const TAO_ObjectKey &key, + TAO_Stub *create_stub_object (const TAO_ObjectKey &key, const char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // Makes sure that the ORB is open and then creates an IIOP object diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index c50e6fcf15a..55099af9124 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -34,7 +34,7 @@ CORBA_Object::~CORBA_Object (void) this->protocol_proxy_->_decr_refcnt (); } -CORBA_Object::CORBA_Object (STUB_Object *protocol_proxy, +CORBA_Object::CORBA_Object (TAO_Stub *protocol_proxy, TAO_ServantBase *servant, CORBA::Boolean collocated) : servant_ (servant), @@ -80,7 +80,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, CORBA::Boolean _tao_retval = 0; - STUB_Object *istub = this->_stubobj (); + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); @@ -155,7 +155,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) { CORBA::Boolean _tao_retval = 0; - STUB_Object *istub = this->_stubobj (); + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); @@ -287,7 +287,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) // @@ this should use the _nil() method... CORBA::InterfaceDef_ptr _tao_retval = 0; - STUB_Object *istub = this->_stubobj (); + TAO_Stub *istub = this->_stubobj (); if (istub == 0) ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); @@ -356,7 +356,7 @@ operator<< (TAO_OutputCDR& cdr, const CORBA_Object* x) return cdr.good_bit (); } - STUB_Object *stubobj = x->_stubobj (); + TAO_Stub *stubobj = x->_stubobj (); if (stubobj == 0) return 0; @@ -502,16 +502,16 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x) return 0; } - // Ownership of type_hint is given to STUB_Object - // STUB_Object will make a copy of mp! - STUB_Object *objdata; - ACE_NEW_RETURN (objdata, STUB_Object (type_hint._retn (), + // Ownership of type_hint is given to TAO_Stub + // TAO_Stub will make a copy of mp! + TAO_Stub *objdata; + ACE_NEW_RETURN (objdata, TAO_Stub (type_hint._retn (), mp.get ()), 0); if (objdata == 0) return 0; - // Create a new CORBA_Object and give it the STUB_Object just + // Create a new CORBA_Object and give it the TAO_Stub just // created. TAO_ServantBase *servant = TAO_ORB_Core_instance ()->orb ()->_get_collocated_servant (objdata); diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 2f7036c58a6..a2083840876 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -28,7 +28,7 @@ #include "tao/corbafwd.h" class TAO_ServantBase; -class STUB_Object; +class TAO_Stub; class TAO_Context; typedef TAO_Context *TAO_Context_ptr; @@ -122,7 +122,7 @@ public: CORBA::ULong _decr_refcnt (void); // Decrement the reference count. - CORBA_Object (STUB_Object *p = 0, + CORBA_Object (TAO_Stub *p = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0); // constructor @@ -134,7 +134,7 @@ public: // Return the object key as an out parameter. Caller should release // return value when finished with it. - virtual STUB_Object *_stubobj (void) const; + virtual TAO_Stub *_stubobj (void) const; // get the underlying stub object virtual void _use_locate_requests (CORBA::Boolean use_it); @@ -150,7 +150,7 @@ protected: // objects. private: - STUB_Object *protocol_proxy_; + TAO_Stub *protocol_proxy_; // Pointer to the protocol-specific "object" containing important // profiling information regarding this proxy. // The protocol proxy is (potentially) shared among several diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i index e5f68aab7e8..f06fdef545a 100644 --- a/TAO/tao/Object.i +++ b/TAO/tao/Object.i @@ -51,7 +51,7 @@ CORBA::is_nil (CORBA::Object_ptr obj) return obj == 0; } -ACE_INLINE STUB_Object * +ACE_INLINE TAO_Stub * CORBA_Object::_stubobj (void) const { return this->protocol_proxy_; diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp index 839a1fd6693..73a862019a5 100644 --- a/TAO/tao/POAC.cpp +++ b/TAO/tao/POAC.cpp @@ -236,7 +236,7 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow ( return PortableServer::ThreadPolicy::_nil (); if (!obj->_is_a ("IDL:PortableServer/ThreadPolicy:1.0", env)) return PortableServer::ThreadPolicy::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant()) { @@ -330,7 +330,7 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow ( return PortableServer::LifespanPolicy::_nil (); if (!obj->_is_a ("IDL:PortableServer/LifespanPolicy:1.0", env)) return PortableServer::LifespanPolicy::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant()) { @@ -425,7 +425,7 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narr return PortableServer::IdUniquenessPolicy::_nil (); if (!obj->_is_a ("IDL:PortableServer/IdUniquenessPolicy:1.0", env)) return PortableServer::IdUniquenessPolicy::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant()) { @@ -515,7 +515,7 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narr return PortableServer::IdAssignmentPolicy::_nil (); if (!obj->_is_a ("IDL:PortableServer/IdAssignmentPolicy:1.0", env)) return PortableServer::IdAssignmentPolicy::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant()) { @@ -608,7 +608,7 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP return PortableServer::ImplicitActivationPolicy::_nil (); if (!obj->_is_a ("IDL:PortableServer/ImplicitActivationPolicy:1.0", env)) return PortableServer::ImplicitActivationPolicy::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant()) { @@ -698,7 +698,7 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic return PortableServer::ServantRetentionPolicy::_nil (); if (!obj->_is_a ("IDL:PortableServer/ServantRetentionPolicy:1.0", env)) return PortableServer::ServantRetentionPolicy::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant()) { @@ -789,7 +789,7 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol return PortableServer::RequestProcessingPolicy::_nil (); if (!obj->_is_a ("IDL:PortableServer/RequestProcessingPolicy:1.0", env)) return PortableServer::RequestProcessingPolicy::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant()) { @@ -872,7 +872,7 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( return PortableServer::POAManager::_nil (); } // end of if - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POAManager:1.0"); return new POA_PortableServer::_tao_collocated_POAManager( @@ -1055,7 +1055,7 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( return PortableServer::AdapterActivator::_nil (); } // end of if - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/AdapterActivator:1.0"); return new POA_PortableServer::_tao_collocated_AdapterActivator( @@ -1110,7 +1110,7 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( return PortableServer::ServantManager::_nil (); } // end of if - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantManager:1.0"); return new POA_PortableServer::_tao_collocated_ServantManager( @@ -1168,7 +1168,7 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( return PortableServer::ServantActivator::_nil (); } // end of if - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantActivator:1.0"); return new POA_PortableServer::_tao_collocated_ServantActivator( @@ -1224,7 +1224,7 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( return PortableServer::ServantLocator::_nil (); } // end of if - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantLocator:1.0"); return new POA_PortableServer::_tao_collocated_ServantLocator( @@ -1285,7 +1285,7 @@ PortableServer::POA_ptr PortableServer::POA::_narrow ( return PortableServer::POA::_nil (); } // end of if - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POA:1.0"); return new POA_PortableServer::_tao_collocated_POA( @@ -2719,7 +2719,7 @@ PortableServer::Current_ptr PortableServer::Current::_narrow ( return PortableServer::Current::_nil (); if (!obj->_is_a ("IDL:PortableServer/Current:1.0", env)) return PortableServer::Current::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant()) { diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h index 1784505209f..73c9339e419 100644 --- a/TAO/tao/POAC.h +++ b/TAO/tao/POAC.h @@ -312,7 +312,7 @@ public: virtual ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: - ThreadPolicy (STUB_Object *objref = 0, + ThreadPolicy (TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0); public: @@ -417,7 +417,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: LifespanPolicy ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -521,7 +521,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: IdUniquenessPolicy ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -625,7 +625,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: IdAssignmentPolicy ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -732,7 +732,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: ImplicitActivationPolicy ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -841,7 +841,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: ServantRetentionPolicy ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -951,7 +951,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: RequestProcessingPolicy ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -1090,7 +1090,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: POAManager ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -1187,7 +1187,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: AdapterActivator ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -1283,7 +1283,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: ServantManager ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -1380,7 +1380,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: ServantActivator ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -1480,7 +1480,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: ServantLocator ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -1991,7 +1991,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: POA ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); @@ -2121,7 +2121,7 @@ public: virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); protected: Current ( - STUB_Object *objref = 0, + TAO_Stub *objref = 0, TAO_ServantBase *servant = 0, CORBA::Boolean collocated = 0 ); diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i index 697d214a414..f6229c75d59 100644 --- a/TAO/tao/POAC.i +++ b/TAO/tao/POAC.i @@ -386,7 +386,7 @@ PortableServer::_tao_seq_Octet_out::operator[] (CORBA::ULong index) ACE_INLINE PortableServer::ThreadPolicy::ThreadPolicy( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -580,7 +580,7 @@ PortableServer::ThreadPolicy_out::operator-> (void) ACE_INLINE PortableServer::LifespanPolicy::LifespanPolicy( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -773,7 +773,7 @@ PortableServer::LifespanPolicy_out::operator-> (void) ACE_INLINE PortableServer::IdUniquenessPolicy::IdUniquenessPolicy( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -966,7 +966,7 @@ PortableServer::IdUniquenessPolicy_out::operator-> (void) ACE_INLINE PortableServer::IdAssignmentPolicy::IdAssignmentPolicy( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -1161,7 +1161,7 @@ PortableServer::IdAssignmentPolicy_out::operator-> (void) ACE_INLINE PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -1354,7 +1354,7 @@ PortableServer::ImplicitActivationPolicy_out::operator-> (void) ACE_INLINE PortableServer::ServantRetentionPolicy::ServantRetentionPolicy( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -1547,7 +1547,7 @@ PortableServer::ServantRetentionPolicy_out::operator-> (void) ACE_INLINE PortableServer::RequestProcessingPolicy::RequestProcessingPolicy( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -1742,7 +1742,7 @@ PortableServer::RequestProcessingPolicy_out::operator-> (void) ACE_INLINE PortableServer::POAManager::POAManager( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -1937,7 +1937,7 @@ PortableServer::POAManager_out::operator-> (void) ACE_INLINE PortableServer::AdapterActivator::AdapterActivator( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -2130,7 +2130,7 @@ PortableServer::AdapterActivator_out::operator-> (void) ACE_INLINE PortableServer::ServantManager::ServantManager( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -2323,7 +2323,7 @@ PortableServer::ServantManager_out::operator-> (void) ACE_INLINE PortableServer::ServantActivator::ServantActivator( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -2516,7 +2516,7 @@ PortableServer::ServantActivator_out::operator-> (void) ACE_INLINE PortableServer::ServantLocator::ServantLocator( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -2711,7 +2711,7 @@ PortableServer::ServantLocator_out::operator-> (void) ACE_INLINE PortableServer::POA::POA( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) @@ -2898,7 +2898,7 @@ PortableServer::POA_out::operator-> (void) ACE_INLINE PortableServer::Current::Current( - STUB_Object *objref, + TAO_Stub *objref, TAO_ServantBase *servant, CORBA::Boolean collocated ) diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp index f884bdcb571..4634611c0fc 100644 --- a/TAO/tao/POAS.cpp +++ b/TAO/tao/POAS.cpp @@ -158,7 +158,7 @@ const char* POA_PortableServer::ThreadPolicy::_interface_repository_id (void) co POA_PortableServer::_tao_collocated_ThreadPolicy::_tao_collocated_ThreadPolicy ( POA_PortableServer::ThreadPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, ThreadPolicy) (stub, servant, 1), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub), @@ -220,7 +220,7 @@ POA_PortableServer::_tao_collocated_ThreadPolicy::value ( PortableServer::ThreadPolicy* POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_ThreadPolicy (this, stub); @@ -366,7 +366,7 @@ const char* POA_PortableServer::LifespanPolicy::_interface_repository_id (void) POA_PortableServer::_tao_collocated_LifespanPolicy::_tao_collocated_LifespanPolicy ( POA_PortableServer::LifespanPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, LifespanPolicy) (stub, servant, 1), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub), @@ -427,7 +427,7 @@ POA_PortableServer::_tao_collocated_LifespanPolicy::value ( PortableServer::LifespanPolicy* POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub); @@ -571,7 +571,7 @@ const char* POA_PortableServer::IdUniquenessPolicy::_interface_repository_id (vo POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_tao_collocated_IdUniquenessPolicy ( POA_PortableServer::IdUniquenessPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, IdUniquenessPolicy) (stub, servant, 1), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub), @@ -632,7 +632,7 @@ POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value ( PortableServer::IdUniquenessPolicy* POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy (this, stub); @@ -776,7 +776,7 @@ const char* POA_PortableServer::IdAssignmentPolicy::_interface_repository_id (vo POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_tao_collocated_IdAssignmentPolicy ( POA_PortableServer::IdAssignmentPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, IdAssignmentPolicy) (stub, servant, 1), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub), @@ -837,7 +837,7 @@ POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value ( PortableServer::IdAssignmentPolicy* POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, stub); @@ -983,7 +983,7 @@ const char* POA_PortableServer::ImplicitActivationPolicy::_interface_repository_ POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_tao_collocated_ImplicitActivationPolicy ( POA_PortableServer::ImplicitActivationPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, ImplicitActivationPolicy) (stub, servant, 1), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub), @@ -1044,7 +1044,7 @@ POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value ( PortableServer::ImplicitActivationPolicy* POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub); @@ -1188,7 +1188,7 @@ const char* POA_PortableServer::ServantRetentionPolicy::_interface_repository_id POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_tao_collocated_ServantRetentionPolicy ( POA_PortableServer::ServantRetentionPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, ServantRetentionPolicy) (stub, servant, 1), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub), @@ -1249,7 +1249,7 @@ POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value ( PortableServer::ServantRetentionPolicy* POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub); @@ -1393,7 +1393,7 @@ const char* POA_PortableServer::RequestProcessingPolicy::_interface_repository_i POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_tao_collocated_RequestProcessingPolicy ( POA_PortableServer::RequestProcessingPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, RequestProcessingPolicy) (stub, servant, 1), ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub), @@ -1454,7 +1454,7 @@ POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value ( PortableServer::RequestProcessingPolicy* POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, stub); @@ -1558,7 +1558,7 @@ const char* POA_PortableServer::POAManager::_interface_repository_id (void) cons POA_PortableServer::_tao_collocated_POAManager::_tao_collocated_POAManager ( POA_PortableServer::POAManager_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, POAManager) (stub, servant, 1), CORBA_Object (stub, servant, 1), @@ -1633,7 +1633,7 @@ void POA_PortableServer::_tao_collocated_POAManager::deactivate ( PortableServer::POAManager* POA_PortableServer::POAManager::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_POAManager (this, stub); @@ -1737,7 +1737,7 @@ const char* POA_PortableServer::AdapterActivator::_interface_repository_id (void POA_PortableServer::_tao_collocated_AdapterActivator::_tao_collocated_AdapterActivator ( POA_PortableServer::AdapterActivator_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, AdapterActivator) (stub, servant, 1), CORBA_Object (stub, servant, 1), @@ -1778,7 +1778,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_ada PortableServer::AdapterActivator* POA_PortableServer::AdapterActivator::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_AdapterActivator (this, stub); @@ -1880,7 +1880,7 @@ const char* POA_PortableServer::ServantManager::_interface_repository_id (void) POA_PortableServer::_tao_collocated_ServantManager::_tao_collocated_ServantManager ( POA_PortableServer::ServantManager_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, ServantManager) (stub, servant, 1), CORBA_Object (stub, servant, 1), @@ -1908,7 +1908,7 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a ( PortableServer::ServantManager* POA_PortableServer::ServantManager::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_ServantManager (this, stub); @@ -2013,7 +2013,7 @@ const char* POA_PortableServer::ServantActivator::_interface_repository_id (void POA_PortableServer::_tao_collocated_ServantActivator::_tao_collocated_ServantActivator ( POA_PortableServer::ServantActivator_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, ServantActivator) (stub, servant, 1), ACE_NESTED_CLASS (POA_PortableServer, _tao_collocated_ServantManager) (servant, stub), @@ -2074,7 +2074,7 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize ( PortableServer::ServantActivator* POA_PortableServer::ServantActivator::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_ServantActivator (this, stub); @@ -2179,7 +2179,7 @@ const char* POA_PortableServer::ServantLocator::_interface_repository_id (void) POA_PortableServer::_tao_collocated_ServantLocator::_tao_collocated_ServantLocator ( POA_PortableServer::ServantLocator_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, ServantLocator) (stub, servant, 1), ACE_NESTED_CLASS (POA_PortableServer, _tao_collocated_ServantManager) (servant, stub), @@ -2244,7 +2244,7 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke ( PortableServer::ServantLocator* POA_PortableServer::ServantLocator::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_ServantLocator (this, stub); @@ -2348,7 +2348,7 @@ const char* POA_PortableServer::POA::_interface_repository_id (void) const POA_PortableServer::_tao_collocated_POA::_tao_collocated_POA ( POA_PortableServer::POA_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, POA) (stub, servant, 1), CORBA_Object (stub, servant, 1), @@ -2712,7 +2712,7 @@ CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference ( PortableServer::POA* POA_PortableServer::POA::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_POA (this, stub); @@ -2889,7 +2889,7 @@ const char* POA_PortableServer::Current::_interface_repository_id (void) const POA_PortableServer::_tao_collocated_Current::_tao_collocated_Current ( POA_PortableServer::Current_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : ACE_NESTED_CLASS (PortableServer, Current) (stub, servant, 1), ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Current) (servant, stub), @@ -2936,7 +2936,7 @@ PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_obje PortableServer::Current* POA_PortableServer::Current::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_PortableServer::_tao_collocated_Current (this, stub); diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h index 3e365737080..6eab81f695b 100644 --- a/TAO/tao/POAS.h +++ b/TAO/tao/POAS.h @@ -74,7 +74,7 @@ public: public: _tao_collocated_ThreadPolicy ( ThreadPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); ThreadPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -149,7 +149,7 @@ public: public: _tao_collocated_LifespanPolicy ( LifespanPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); LifespanPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -224,7 +224,7 @@ public: public: _tao_collocated_IdUniquenessPolicy ( IdUniquenessPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); IdUniquenessPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -299,7 +299,7 @@ public: public: _tao_collocated_IdAssignmentPolicy ( IdAssignmentPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); IdAssignmentPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -376,7 +376,7 @@ public: public: _tao_collocated_ImplicitActivationPolicy ( ImplicitActivationPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); ImplicitActivationPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -451,7 +451,7 @@ public: public: _tao_collocated_ServantRetentionPolicy ( ServantRetentionPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); ServantRetentionPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -526,7 +526,7 @@ public: public: _tao_collocated_RequestProcessingPolicy ( RequestProcessingPolicy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); RequestProcessingPolicy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -599,7 +599,7 @@ public: public: _tao_collocated_POAManager ( POAManager_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); POAManager_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -671,7 +671,7 @@ public: public: _tao_collocated_AdapterActivator ( AdapterActivator_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); AdapterActivator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -723,7 +723,7 @@ public: public: _tao_collocated_ServantManager ( ServantManager_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); ServantManager_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -775,7 +775,7 @@ public: public: _tao_collocated_ServantActivator ( ServantActivator_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); ServantActivator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -844,7 +844,7 @@ public: public: _tao_collocated_ServantLocator ( ServantLocator_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); ServantLocator_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -979,7 +979,7 @@ public: public: _tao_collocated_POA ( POA_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); POA_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -1168,7 +1168,7 @@ public: public: _tao_collocated_Current ( Current_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); Current_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h index 0801dc79a5d..2ea204791aa 100644 --- a/TAO/tao/POA_CORBA.h +++ b/TAO/tao/POA_CORBA.h @@ -98,7 +98,7 @@ public: public: _tao_collocated_Policy ( Policy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); Policy_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -159,7 +159,7 @@ public: public: _tao_collocated_Current ( Current_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); Current_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -446,7 +446,7 @@ class _tao_collocated_DynAny : public virtual CORBA_DynAny public: _tao_collocated_DynAny ( DynAny_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); DynAny_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -714,7 +714,7 @@ class _tao_collocated_DynEnum : public virtual CORBA_DynEnum, public: _tao_collocated_DynEnum ( DynEnum_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); DynEnum_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -811,7 +811,7 @@ class _tao_collocated_DynStruct : public virtual CORBA_DynStruct, public: _tao_collocated_DynStruct ( DynStruct_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); DynStruct_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -928,7 +928,7 @@ class _tao_collocated_DynUnion : public virtual CORBA_DynUnion, public: _tao_collocated_DynUnion ( DynUnion_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); DynUnion_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -1050,7 +1050,7 @@ class _tao_collocated_DynSequence : public virtual CORBA_DynSequence, public: _tao_collocated_DynSequence ( DynSequence_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); DynSequence_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( @@ -1137,7 +1137,7 @@ class _tao_collocated_DynArray : public virtual CORBA_DynArray, public: _tao_collocated_DynArray ( DynArray_ptr servant, - STUB_Object *stub + TAO_Stub *stub ); DynArray_ptr _get_servant (void) const; virtual CORBA::Boolean _is_a ( diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp index 3cdb1eb42b6..3a1cd46767f 100644 --- a/TAO/tao/Pluggable.cpp +++ b/TAO/tao/Pluggable.cpp @@ -87,7 +87,7 @@ TAO_Connector_Registry::preconnect (const char *the_preconnections) } int -TAO_Connector_Registry::connect (STUB_Object *&obj, +TAO_Connector_Registry::connect (TAO_Stub *&obj, TAO_Transport *&transport) { CORBA::ULong req_tag = TAO_IOP_TAG_INTERNET_IOP; diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h index a502dc594c6..52a04090472 100644 --- a/TAO/tao/Pluggable.h +++ b/TAO/tao/Pluggable.h @@ -28,7 +28,7 @@ class ACE_Addr; class ACE_Reactor; class TAO_ORB_Core; -class STUB_Object; +class TAO_Stub; class TAO_Profile; class TAO_MProfile; class TAO_Resource_Factory; @@ -433,7 +433,7 @@ public: // For this list of preconnections call the connector specific // preconnect method for each preconnection. - int connect (STUB_Object *&obj, TAO_Transport *&); + int connect (TAO_Stub *&obj, TAO_Transport *&); // This is where the transport protocol is selected based on some // policy. This member will call the connect member of the // TAO_Connector class which in turn will call the concrete diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index c15c8aa4fa5..8b03523d7ce 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -37,7 +37,7 @@ CORBA_Policy_ptr CORBA_Policy::_narrow ( return CORBA_Policy::_nil (); if (!obj->_is_a ("IDL:CORBA/Policy:1.0", env)) return CORBA_Policy::_nil (); - STUB_Object *stub = obj->_stubobj (); + TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); if (!obj->_is_collocated () || !obj->_servant() @@ -72,7 +72,7 @@ CORBA::PolicyType CORBA_Policy::policy_type ( {"_get_policy_type", 1, 1, _get_CORBA_Policy_policy_type_paramdata, 0, 0}; CORBA::PolicyType _tao_retval = 0; - STUB_Object *istub = this->_stubobj (); + TAO_Stub *istub = this->_stubobj (); if (istub) { void* _tao_arguments[1]; @@ -100,7 +100,7 @@ CORBA_Policy_ptr CORBA_Policy::copy ( {"copy", 1, 1, CORBA_Policy_copy_paramdata, 0, 0}; CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil (); - STUB_Object *istub = this->_stubobj (); + TAO_Stub *istub = this->_stubobj (); if (istub) { CORBA::Object_ptr _tao_base_retval = CORBA::Object::_nil (); @@ -130,7 +130,7 @@ void CORBA_Policy::destroy ( static const TAO_Call_Data CORBA_Policy_destroy_calldata = {"destroy", 1, 1, CORBA_Policy_destroy_paramdata, 0, 0}; - STUB_Object *istub = this->_stubobj (); + TAO_Stub *istub = this->_stubobj (); if (istub) { void* _tao_arguments[1]; diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 74c6b54cf7e..d0cc98b9ff7 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -111,7 +111,7 @@ public: virtual const char* _interface_repository_id (void) const; protected: CORBA_Policy (void); // default constructor - CORBA_Policy (STUB_Object *objref, + CORBA_Policy (TAO_Stub *objref, TAO_ServantBase *_tao_servant = 0, CORBA::Boolean _tao_collocated = 0 ); diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i index e9efc734932..e98af124408 100644 --- a/TAO/tao/PolicyC.i +++ b/TAO/tao/PolicyC.i @@ -14,7 +14,7 @@ CORBA_Policy::CORBA_Policy (void) // default constructor {} ACE_INLINE -CORBA_Policy::CORBA_Policy (STUB_Object *objref, +CORBA_Policy::CORBA_Policy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) : CORBA_Object (objref, _tao_servant, _tao_collocated) diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp index fc38fecb15a..17c3952cfc4 100644 --- a/TAO/tao/PolicyS.cpp +++ b/TAO/tao/PolicyS.cpp @@ -224,7 +224,7 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const POA_CORBA::_tao_collocated_Policy::_tao_collocated_Policy ( POA_CORBA::Policy_ptr servant, - STUB_Object *stub + TAO_Stub *stub ) : CORBA_Policy (stub, servant, 1), CORBA_Object (stub, servant, 1), @@ -279,7 +279,7 @@ void POA_CORBA::_tao_collocated_Policy::destroy ( CORBA::Policy* POA_CORBA::Policy::_this (CORBA_Environment &TAO_IN_ENV) { - STUB_Object *stub = this->_create_stub (TAO_IN_ENV); + TAO_Stub *stub = this->_create_stub (TAO_IN_ENV); if (TAO_IN_ENV.exception () != 0) return 0; return new POA_CORBA::_tao_collocated_Policy (this, stub); diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp index e45aff5f8ac..be79982fca4 100644 --- a/TAO/tao/Request.cpp +++ b/TAO/tao/Request.cpp @@ -85,7 +85,7 @@ CORBA_Request::~CORBA_Request (void) void CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV) { - STUB_Object *stub = this->target_->_stubobj (); + TAO_Stub *stub = this->target_->_stubobj (); stub->do_dynamic_call ((char *) opname_, 1, @@ -99,7 +99,7 @@ CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV) void CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV) { - STUB_Object *stub = this->target_->_stubobj (); + TAO_Stub *stub = this->target_->_stubobj (); stub->do_dynamic_call ((char *) opname_, 0, diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp index 74df767646a..fe90e7fbe17 100644 --- a/TAO/tao/Servant_Base.cpp +++ b/TAO/tao/Servant_Base.cpp @@ -85,10 +85,10 @@ TAO_ServantBase::_bind (const char *opname, return optable_->bind (opname, skel_ptr); } -STUB_Object * +TAO_Stub * TAO_ServantBase::_create_stub (CORBA_Environment &env) { - STUB_Object *stub; + TAO_Stub *stub; TAO_ORB_Core *orb_core = TAO_ORB_Core_instance (); TAO_POA_Current *poa_current = orb_core->poa_current (); @@ -122,7 +122,7 @@ TAO_ServantBase::_create_stub (CORBA_Environment &env) return stub; } -STUB_Object * +TAO_Stub * TAO_Local_ServantBase::_create_stub (CORBA_Environment &env) { PortableServer::ObjectId_var invalid_oid = @@ -147,7 +147,7 @@ TAO_DynamicImplementation::_this (CORBA::Environment &env) // object. Unlike _this() for static skeletons, its return type is // not interface-specific because a DSI servant may very well // incarnate multiple CORBA objects of different types. - STUB_Object *stub = this->_create_stub (env); + TAO_Stub *stub = this->_create_stub (env); if (env.exception () != 0) return CORBA::Object::_nil (); @@ -171,7 +171,7 @@ TAO_DynamicImplementation::_downcast (const char *repository_id) return this; } -STUB_Object * +TAO_Stub * TAO_DynamicImplementation::_create_stub (CORBA::Environment &env) { // If DynamicImplementation::_this() is invoked outside of the diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h index fcf4f406aa4..ae01eed0892 100644 --- a/TAO/tao/Servant_Base.h +++ b/TAO/tao/Servant_Base.h @@ -46,7 +46,7 @@ public: virtual void *_downcast (const char *repository_id) = 0; // Get the correct vtable. - virtual STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual TAO_Stub *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // This is an auxiliar method for _this() and _narrow(). protected: @@ -97,7 +97,7 @@ class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase // = TITLE // Base class for local skeletons and servants. protected: - STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + TAO_Stub *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // This is an auxiliar method for _this(). Make sure *not* to // register with the default POA }; @@ -139,7 +139,7 @@ protected: virtual void *_downcast (const char *repository_id); // Simply returns "this" - virtual STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + virtual TAO_Stub *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); // This is an auxiliar method for _this() and _narrow(). virtual void _dispatch (CORBA::ServerRequest &request, diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 9f740c74212..139b581367e 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -26,19 +26,19 @@ #include "tao/Timeprobe.h" -ACE_RCSID(tao, STUB_Object, "$Id$") +ACE_RCSID(tao, TAO_Stub, "$Id$") #if defined (ACE_ENABLE_TIMEPROBES) -static const char *TAO_STUB_Object_Timeprobe_Description[] = +static const char *TAO_TAO_Stub_Timeprobe_Description[] = { - "STUB_Object::do_static_call - start", - "STUB_Object::do_static_call - end", - "STUB_Object::do_static_call - set_cancel", - "STUB_Object::do_static_call - grab_orb_core", - "STUB_Object::do_static_call - invocation_ctor", - "STUB_Object::do_static_call - invocation_start", - "STUB_Object::do_static_call - put_params" + "TAO_Stub::do_static_call - start", + "TAO_Stub::do_static_call - end", + "TAO_Stub::do_static_call - set_cancel", + "TAO_Stub::do_static_call - grab_orb_core", + "TAO_Stub::do_static_call - invocation_ctor", + "TAO_Stub::do_static_call - invocation_start", + "TAO_Stub::do_static_call - put_params" }; enum @@ -54,12 +54,12 @@ enum }; // Setup Timeprobes -ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_STUB_Object_Timeprobe_Description, +ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_TAO_Stub_Timeprobe_Description, TAO_STUB_OBJECT_DO_STATIC_CALL_START); #endif /* ACE_ENABLE_TIMEPROBES */ -STUB_Object::STUB_Object (char *repository_id, +TAO_Stub::TAO_Stub (char *repository_id, TAO_MProfile &profiles) : type_id (repository_id), base_profiles_ ((CORBA::ULong) 0), @@ -79,7 +79,7 @@ STUB_Object::STUB_Object (char *repository_id, set_base_profiles (&profiles); } -STUB_Object::STUB_Object (char *repository_id, +TAO_Stub::TAO_Stub (char *repository_id, TAO_Profile *profile) : type_id (repository_id), base_profiles_ ((CORBA::ULong) 0), @@ -105,7 +105,7 @@ STUB_Object::STUB_Object (char *repository_id, } -STUB_Object::STUB_Object (char *repository_id, +TAO_Stub::TAO_Stub (char *repository_id, TAO_MProfile *profiles) : type_id (repository_id), base_profiles_ ((CORBA::ULong) 0), @@ -128,7 +128,7 @@ STUB_Object::STUB_Object (char *repository_id, } -STUB_Object::STUB_Object (char *repository_id) +TAO_Stub::TAO_Stub (char *repository_id) : type_id (repository_id), base_profiles_ ((CORBA::ULong) 0), forward_profiles_ (0), @@ -152,7 +152,7 @@ STUB_Object::STUB_Object (char *repository_id) // @@ Use all profiles for hash function!!!!! FRED // can get different values, depending on the profile_in_use!! CORBA::ULong -STUB_Object::hash (CORBA::ULong max, +TAO_Stub::hash (CORBA::ULong max, CORBA::Environment &env) { // we rely on the profile object to has it's address info @@ -190,7 +190,7 @@ int operator!=(const TAO_opaque& rhs, // NOTE that this must NOT go across the network! // @@ Two object references are the same if any two profiles are the same! CORBA::Boolean -STUB_Object::is_equivalent (CORBA::Object_ptr other_obj, +TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj, CORBA::Environment &env) { if (CORBA::is_nil (other_obj) == 1) @@ -209,7 +209,7 @@ STUB_Object::is_equivalent (CORBA::Object_ptr other_obj, // Memory managment CORBA::ULong -STUB_Object::_incr_refcnt (void) +TAO_Stub::_incr_refcnt (void) { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0); @@ -217,7 +217,7 @@ STUB_Object::_incr_refcnt (void) } CORBA::ULong -STUB_Object::_decr_refcnt (void) +TAO_Stub::_decr_refcnt (void) { { ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->refcount_lock_, 0); @@ -294,7 +294,7 @@ private: // which does all the work. void -STUB_Object::do_static_call (CORBA::Environment &ACE_TRY_ENV, +TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV, const TAO_Call_Data *info, void** args) @@ -482,7 +482,7 @@ STUB_Object::do_static_call (CORBA::Environment &ACE_TRY_ENV, } void -STUB_Object::put_params (CORBA::Environment &ACE_TRY_ENV, +TAO_Stub::put_params (CORBA::Environment &ACE_TRY_ENV, const TAO_Call_Data *info, TAO_GIOP_Invocation &call, void** args) @@ -523,7 +523,7 @@ STUB_Object::put_params (CORBA::Environment &ACE_TRY_ENV, // DII analogue of the above. void -STUB_Object::do_dynamic_call (const char *opname, +TAO_Stub::do_dynamic_call (const char *opname, CORBA::Boolean is_roundtrip, CORBA::NVList_ptr args, CORBA::NamedValue_ptr result, @@ -772,7 +772,7 @@ STUB_Object::do_dynamic_call (const char *opname, } void -STUB_Object::put_params (TAO_GIOP_Invocation &call, +TAO_Stub::put_params (TAO_GIOP_Invocation &call, CORBA::NVList_ptr args, CORBA::Environment &ACE_TRY_ENV) { diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index 6e419e23d35..e60e2954a32 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -188,10 +188,10 @@ struct TAO_Skel_Entry // skeleton corresponding to the operation }; -class TAO_Export STUB_Object +class TAO_Export TAO_Stub { // = TITLE - // STUB_Object + // TAO_Stub // // = DESCRIPTION // Per-objref data includes the (protocol-specific) Profile, which @@ -207,8 +207,8 @@ class TAO_Export STUB_Object // type. public: void do_static_call (CORBA_Environment &TAO_IN_ENV, - const TAO_Call_Data *info, - void** args); + const TAO_Call_Data *info, + void** args); // The "stub interpreter" method parameters are: // // - TAO_IN_ENV ... used for exception reporting @@ -268,7 +268,8 @@ public: // equivalent). CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + CORBA::default_environment ()); // XXX All objref representations should know how to marshal // themselves. That will involve ensuring that the IOR that gets // marshaled talks a specific protocol, otherwise the target of a @@ -282,7 +283,7 @@ public: // Our Constructors ... - STUB_Object (char * repository_id); + TAO_Stub (char * repository_id); // XXX All objref representations should know how to marshal // themselves. That will involve ensuring that the IOR that gets // marshaled talks a specific protocol, otherwise the target of a @@ -294,19 +295,19 @@ public: // only supports one protocol -- the problem won't show up. // "Multiprotocol ORBs" will need to solve that problem though. ] - STUB_Object (char *repository_id, - TAO_Profile *profile); + TAO_Stub (char *repository_id, + TAO_Profile *profile); // degenerate case where only one profile is wanted. This method // is depricated and is here ONLY for compatibility with multiple // profile unfriendly code! The profile is given to the MProfile // object. - STUB_Object (char *repository_id, + TAO_Stub (char *repository_id, TAO_MProfile *profiles); // Construct from a repository ID and a list of profiles. - STUB_Object (char *repository_id, - TAO_MProfile &profiles); + TAO_Stub (char *repository_id, + TAO_MProfile &profiles); // Construct from a repository ID and a profile ID.profile ID. // = Memory management. @@ -321,7 +322,7 @@ public: TAO_MProfile *get_profiles (void); // Copy of the profile list, user must free memory when done. // although the user can call get_profiles then reorder - // the list and give it back to STUB_Object. + // the list and give it back to TAO_Stub. const TAO_MProfile& get_base_profiles (void) const; // Obtain a reference to the basic profile set. @@ -388,7 +389,8 @@ protected: void put_params (TAO_GIOP_Invocation &call, CORBA::NVList_ptr args, - CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); + CORBA_Environment &TAO_IN_ENV = + CORBA::default_environment ()); // Helper method to factor out common code in dynamic oneway // vs. twoway invocations. @@ -415,7 +417,7 @@ private: // NOT THREAD-SAFE. utility method which pops all forward profile // lists and resets the forward_profiles_ pointer. - ~STUB_Object (void); + ~TAO_Stub (void); // Destructor is to be called only through _decr_refcnt() TAO_Profile *next_forward_profile (void); @@ -424,7 +426,7 @@ private: private: // @@ For now, we keep track of transport specific profiles here, // but in the next iteration this will go away ... only transport - // neutral info is kept here => STUB_Object should also go away! + // neutral info is kept here => TAO_Stub should also go away! // fredk TAO_MProfile base_profiles_; // ordered list of profiles for this object. @@ -452,8 +454,8 @@ private: // distinguishes the first from following calls // = Disallow copy constructor and assignment operator - ACE_UNIMPLEMENTED_FUNC (STUB_Object (const STUB_Object &)) - ACE_UNIMPLEMENTED_FUNC (STUB_Object &operator = (const STUB_Object &)) + ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &)) + ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &)) #if defined (__GNUG__) // G++ (even 2.6.3) stupidly thinks instances can't be created. diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i index cc5f92446d7..df03f76195f 100644 --- a/TAO/tao/Stub.i +++ b/TAO/tao/Stub.i @@ -6,7 +6,7 @@ ACE_INLINE TAO_Profile * -STUB_Object::set_profile_in_use_i (TAO_Profile *pfile) +TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile) { TAO_Profile *old = this->profile_in_use_; @@ -29,14 +29,14 @@ STUB_Object::set_profile_in_use_i (TAO_Profile *pfile) ACE_INLINE void -STUB_Object::reset_first_locate_request (void) +TAO_Stub::reset_first_locate_request (void) { first_locate_request_ = 1; } ACE_INLINE void -STUB_Object::reset_base (void) +TAO_Stub::reset_base (void) { this->base_profiles_.rewind (); reset_first_locate_request (); @@ -47,7 +47,7 @@ STUB_Object::reset_base (void) ACE_INLINE void -STUB_Object::forward_back_one (void) +TAO_Stub::forward_back_one (void) { TAO_MProfile *from = forward_profiles_->forward_from (); @@ -70,7 +70,7 @@ STUB_Object::forward_back_one (void) ACE_INLINE void -STUB_Object::reset_forward (void) +TAO_Stub::reset_forward (void) { while (forward_profiles_) forward_back_one (); @@ -80,7 +80,7 @@ STUB_Object::reset_forward (void) ACE_INLINE void -STUB_Object::reset_profiles_i (void) +TAO_Stub::reset_profiles_i (void) { reset_forward (); reset_base (); @@ -88,7 +88,7 @@ STUB_Object::reset_profiles_i (void) ACE_INLINE void -STUB_Object::reset_profiles (void) +TAO_Stub::reset_profiles (void) { ACE_MT (ACE_GUARD (ACE_Lock, guard, @@ -97,7 +97,7 @@ STUB_Object::reset_profiles (void) } ACE_INLINE -STUB_Object::~STUB_Object (void) +TAO_Stub::~TAO_Stub (void) { assert (this->refcount_ == 0); @@ -119,14 +119,14 @@ STUB_Object::~STUB_Object (void) ACE_INLINE TAO_Profile * -STUB_Object::profile_in_use (void) +TAO_Stub::profile_in_use (void) { return this->profile_in_use_; } ACE_INLINE void -STUB_Object::use_locate_requests (CORBA::Boolean use_it) +TAO_Stub::use_locate_requests (CORBA::Boolean use_it) { if (use_it) { @@ -143,14 +143,14 @@ STUB_Object::use_locate_requests (CORBA::Boolean use_it) ACE_INLINE TAO_MProfile * -STUB_Object::get_profiles (void) +TAO_Stub::get_profiles (void) { return new TAO_MProfile (&base_profiles_); } ACE_INLINE TAO_Profile * -STUB_Object::next_forward_profile (void) +TAO_Stub::next_forward_profile (void) { TAO_Profile *pfile_next = 0; @@ -164,7 +164,7 @@ STUB_Object::next_forward_profile (void) ACE_INLINE TAO_Profile * -STUB_Object::next_profile_i (void) +TAO_Stub::next_profile_i (void) { TAO_Profile *pfile_next = 0; @@ -187,7 +187,7 @@ STUB_Object::next_profile_i (void) ACE_INLINE TAO_Profile * -STUB_Object::next_profile (void) +TAO_Stub::next_profile (void) { ACE_MT (ACE_GUARD_RETURN (ACE_Lock, @@ -199,28 +199,28 @@ STUB_Object::next_profile (void) ACE_INLINE CORBA::Boolean -STUB_Object::valid_forward_profile (void) +TAO_Stub::valid_forward_profile (void) { return (profile_success_ && forward_profiles_); } ACE_INLINE void -STUB_Object::set_valid_profile (void) +TAO_Stub::set_valid_profile (void) { profile_success_ = 1; } ACE_INLINE CORBA::Boolean -STUB_Object::valid_profile (void) +TAO_Stub::valid_profile (void) { return profile_success_; } ACE_INLINE TAO_Profile * -STUB_Object::set_base_profiles (TAO_MProfile *mprofiles) +TAO_Stub::set_base_profiles (TAO_MProfile *mprofiles) { ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, @@ -237,7 +237,7 @@ STUB_Object::set_base_profiles (TAO_MProfile *mprofiles) ACE_INLINE void -STUB_Object::add_forward_profiles (TAO_MProfile *mprofiles) +TAO_Stub::add_forward_profiles (TAO_MProfile *mprofiles) { // we assume that the profile_in_use_ is being // forwarded! Grab the lock so things don't change. @@ -262,7 +262,7 @@ STUB_Object::add_forward_profiles (TAO_MProfile *mprofiles) ACE_INLINE CORBA::Boolean -STUB_Object::next_profile_retry (void) +TAO_Stub::next_profile_retry (void) { ACE_MT (ACE_GUARD_RETURN (ACE_Lock, guard, @@ -286,7 +286,7 @@ STUB_Object::next_profile_retry (void) } ACE_INLINE const TAO_MProfile& -STUB_Object::get_base_profiles (void) const +TAO_Stub::get_base_profiles (void) const { return this->base_profiles_; } diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h index 4868d5249ae..a80af947c1e 100644 --- a/TAO/tao/corbafwd.h +++ b/TAO/tao/corbafwd.h @@ -128,7 +128,10 @@ typedef class CORBA_Exception *CORBA_Exception_ptr; TAO_SYSTEM_EXCEPTION(INTF_REPOS); \ TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \ TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \ - TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); + TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \ + TAO_SYSTEM_EXCEPTION(INV_POLICY); \ + TAO_SYSTEM_EXCEPTION(REBIND); \ + TAO_SYSTEM_EXCEPTION(TIMEOUT); #define TAO_SYSTEM_EXCEPTION(name) \ class CORBA_ ## name @@ -204,8 +207,8 @@ class CORBA_ExceptionList; class TAO_InputCDR; class TAO_OutputCDR; -// @@ TODO This should be TAO_STUB_Object -class STUB_Object; +// @@ TODO This should be TAO_TAO_Stub +class TAO_Stub; // enum values defined in tao/NVList.h, bitwise ORed. typedef u_int CORBA_Flags; diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index f6f36deaa07..8f53b577e35 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -160,7 +160,7 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr, // actual buffer. Hence it makes no sense keeping pointers to stack // memory. // - // See STUB_Object.cpp::do_static_call in which a GIOP_Invocation is + // See TAO_Stub.cpp::do_static_call in which a GIOP_Invocation is // allocated on stack #if 0 any->cdr_ = ACE_Message_Block::duplicate ((ACE_Message_Block *) diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index 883977206d3..423ba851ed8 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -254,7 +254,7 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr, { TAO_OutputCDR *stream = (TAO_OutputCDR *) context; - // Current version: objref is really an STUB_Object. + // Current version: objref is really an TAO_Stub. // @@ But, it need not be. All IIOP specific processing has // been move to the specific transport profile class! // |