diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-09 15:32:27 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-09-09 15:32:27 +0000 |
| commit | 02785e0e6c39fa784e2ec388b929ebb7e5e36c1c (patch) | |
| tree | c90a883299786d2657ae66a0e846c4bae47d3f79 /TAO | |
| parent | ad73f39175d3ada0742e77ff19e921061a4883b1 (diff) | |
| download | ATCD-02785e0e6c39fa784e2ec388b929ebb7e5e36c1c.tar.gz | |
ChangeLogTag: Thu Sep 9 10:30:22 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Container_Base.cpp | 18 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/ciao/Container_Base.h | 6 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Container_Base.cpp | 2 |
4 files changed, 35 insertions, 1 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 3824e2b82cd..47674838f64 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Thu Sep 9 10:30:22 2004 Jeff Parsons <j.parsons@vanderbilt.edu> + + * DAnCE/ciao/Container_Base.cpp: + * DAnCE/ciao/Container_Base.h: + * ciao/Container_Base.cpp: + + Added generate_reference() method to DAnCE version of + Container_Base, and fixed ACE_CHECK macro mistake in + both versions. + Wed Sep 8 11:52:45 2004 Jeff Parsons <j.parsons@vanderbilt.edu> * DAnCE/ciao/Servant_Impl_Base.h: diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp index 794e3927437..2a86cf51568 100644 --- a/TAO/CIAO/DAnCE/ciao/Container_Base.cpp +++ b/TAO/CIAO/DAnCE/ciao/Container_Base.cpp @@ -299,3 +299,21 @@ CIAO::Session_Container::uninstall_component (Components::CCMObject_ptr objref, oid = id._retn (); } + +CORBA::Object_ptr +CIAO::Session_Container::generate_reference (const char *obj_id, + const char *repo_id + ACE_ENV_ARG_DECL) +{ + PortableServer::ObjectId_var oid = + PortableServer::string_to_ObjectId (obj_id); + + CORBA::Object_var objref = + this->poa_->create_reference_with_id (oid.in (), + repo_id + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (CORBA::Object::_nil ()); + + return objref._retn (); +} + diff --git a/TAO/CIAO/DAnCE/ciao/Container_Base.h b/TAO/CIAO/DAnCE/ciao/Container_Base.h index b10863e8188..acc1d511cc4 100644 --- a/TAO/CIAO/DAnCE/ciao/Container_Base.h +++ b/TAO/CIAO/DAnCE/ciao/Container_Base.h @@ -198,6 +198,12 @@ namespace CIAO ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); + // Analog of the POA method that creates an object reference from + // an object id string. + CORBA::Object_ptr generate_reference (const char *obj_id, + const char *repo_id + ACE_ENV_ARG_DECL_WITH_DEFAULTS); + protected: long number_; diff --git a/TAO/CIAO/ciao/Container_Base.cpp b/TAO/CIAO/ciao/Container_Base.cpp index bcd40b2f39d..8e68c915257 100644 --- a/TAO/CIAO/ciao/Container_Base.cpp +++ b/TAO/CIAO/ciao/Container_Base.cpp @@ -296,7 +296,7 @@ CIAO::Session_Container::generate_reference (const char *obj_id, this->poa_->create_reference_with_id (oid.in (), repo_id ACE_ENV_ARG_PARAMETER); - ACE_CHECK; + ACE_CHECK_RETURN (CORBA::Object::_nil ()); return objref._retn (); } |