diff options
| author | pgontla <pgontla@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-18 03:03:39 +0000 |
|---|---|---|
| committer | pgontla <pgontla@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-18 03:03:39 +0000 |
| commit | e1241403ea42088c25dde8073f6332629dabeebd (patch) | |
| tree | 6331cb8e012ac305553e3ff9cad7459aa47f4737 | |
| parent | 18c850a41eaa690a59d2736c7a693b9108c2fc08 (diff) | |
| download | ATCD-e1241403ea42088c25dde8073f6332629dabeebd.tar.gz | |
ChangeLogTag: Thu Jan 17 18:59:14 2002 Priyanka Gontla <pgontla@ece.uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 5 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/IORInfo.cpp | 50 |
2 files changed, 38 insertions, 17 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4ef7aa45a5c..80dfdf4c359 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Thu Jan 17 18:59:14 2002 Priyanka Gontla <pgontla@ece.uci.edu> + + * tao/PortableServer/IORInfo.cpp : + Fixes for the KCC statement-not-reachable warnings. + Thu Jan 17 18:40:49 2002 Priyanka Gontla <pgontla@ece.uci.edu> * tao/TAO_Internal.cpp: diff --git a/TAO/tao/PortableServer/IORInfo.cpp b/TAO/tao/PortableServer/IORInfo.cpp index a93254bf66c..99c6d03b146 100644 --- a/TAO/tao/PortableServer/IORInfo.cpp +++ b/TAO/tao/PortableServer/IORInfo.cpp @@ -87,22 +87,27 @@ TAO_IORInfo::manager_id ( TAO_ENV_SINGLE_ARG_DECL) { /// This method is used to provide a handle to the manager of the /// adapter. - return this->poa_->get_manager_id (TAO_ENV_SINGLE_ARG_PARAMETER); - + PortableInterceptor::AdapterManagerId manager_id = + this->poa_->get_manager_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, CORBA::COMPLETED_NO), 0); + + return manager_id; } PortableInterceptor::AdapterState TAO_IORInfo::state (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->poa_->get_adapter_state (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableInterceptor::AdapterState state = + this->poa_->get_adapter_state (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, CORBA::COMPLETED_NO), 0); + + return state; } PortableInterceptor::ObjectReferenceTemplate * @@ -116,11 +121,17 @@ TAO_IORInfo::adapter_template (TAO_ENV_SINGLE_ARG_DECL) never changes in its life. */ - this->poa_->get_adapter_template (); + PortableInterceptor::ObjectReferenceTemplate *adapter_template = + this->poa_->get_adapter_template (); - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, - CORBA::COMPLETED_NO), - 0); + if (adapter_template == 0) + { + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + CORBA::COMPLETED_NO), + 0); + } + + return adapter_template; } PortableInterceptor::ObjectReferenceFactory * @@ -133,24 +144,29 @@ TAO_IORInfo::current_factory (TAO_ENV_SINGLE_ARG_DECL) be changed. The value of the current_factory can be changed only during the call to components_established method. */ - return this->poa_->get_obj_ref_factory (); - - ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, - CORBA::COMPLETED_NO), - 0); + PortableInterceptor::ObjectReferenceFactory *adapter_factory = + this->poa_->get_obj_ref_factory (); + + if (adapter_factory == 0) + { + ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, + CORBA::COMPLETED_NO), + 0); + } + + return adapter_factory; } void -TAO_IORInfo:: -current_factory (PortableInterceptor::ObjectReferenceFactory * current_factory - TAO_ENV_ARG_DECL) +TAO_IORInfo::current_factory (PortableInterceptor::ObjectReferenceFactory * current_factory + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { this->poa_->set_obj_ref_factory (current_factory TAO_ENV_ARG_PARAMETER); - return; - ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 14, CORBA::COMPLETED_NO)); + + return; } |