diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-14 12:07:45 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-07-14 12:07:45 +0000 |
| commit | 7d9ef3227fad12497bdc63c5e87990f0dcdb5abb (patch) | |
| tree | 9aad484fdf4b8ce1fcdc4f2707f4a1fbd558fda4 | |
| parent | 8f27e83572cb69af9174064a099d228c0351acea (diff) | |
| download | ATCD-7d9ef3227fad12497bdc63c5e87990f0dcdb5abb.tar.gz | |
ChangeLogTag: Fri Jul 14 06:50:57 2000 Irfan Pyarali <irfan@cs.wustl.edu>
41 files changed, 655 insertions, 212 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index a96baacad65..34fac4a84f9 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,58 @@ +Fri Jul 14 06:50:57 2000 Irfan Pyarali <irfan@cs.wustl.edu> + + * tao/PolicyS.cpp (_dispatch): Replaced with new dispatch code. + + * tao/PolicyC.cpp (_unchecked_narrow): Removed call to Smart + Proxy. + + * tao/PortableServerC.h (ThreadPolicyValue and + ImplicitActivationPolicyValue): These two enums should be + outside the minimum POA scope. + + * examples/POA/NewPOA/NewPOA.cpp (print_poa): Changed use of + ACE_TRY_CHECK to ACE_CHECK. + + * tao/diffs: Updated diffs: + + - PolicyC.cpp.diff + - PolicyS.cpp.diff + - PortableServerC.h.diff + + * Updated throw specs in the following files: + + - examples/POA/Adapter_Activator/server.cpp + - examples/POA/Forwarding/Servant_Locator.cpp + - examples/POA/Forwarding/Servant_Locator.h + - examples/POA/Loader/Servant_Activator.cpp + - examples/POA/Loader/Servant_Activator.h + - examples/POA/Loader/Servant_Locator.cpp + - examples/POA/Loader/Servant_Locator.h + - examples/POA/NewPOA/NewPOA.cpp + - examples/POA/On_Demand_Activation/Servant_Activator.cpp + - examples/POA/On_Demand_Activation/Servant_Activator.h + - examples/POA/On_Demand_Activation/Servant_Locator.cpp + - examples/POA/On_Demand_Activation/Servant_Locator.h + - examples/POA/On_Demand_Loading/Servant_Activator.cpp + - examples/POA/On_Demand_Loading/Servant_Activator.h + - examples/POA/On_Demand_Loading/Servant_Locator.cpp + - examples/POA/On_Demand_Loading/Servant_Locator.h + - orbsvcs/IFR_Service/Servant_Locator.cpp + - orbsvcs/IFR_Service/Servant_Locator.h + - orbsvcs/ImplRepo_Service/ImplRepo_i.cpp + - orbsvcs/ImplRepo_Service/ImplRepo_i.h + - orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp + - orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h + - tao/Object_Adapter.cpp + - tao/Object_Adapter.h + - tao/POA.cpp + - tao/POA.h + - tao/POA.i + - tao/POAManager.cpp + - tao/POAManager.h + - tao/POAManager.i + - tests/MProfile_Forwarding/Servant_Locator.cpp + - tests/MProfile_Forwarding/Servant_Locator.h + Thu Jul 13 17:45:07 2000 Jeff Parsons <parsons@cs.wustl.edu> * tests/IDL_Test/reopen_include1.idl: diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp index ec2eaa63f43..39e7a2d636e 100644 --- a/TAO/examples/POA/Adapter_Activator/server.cpp +++ b/TAO/examples/POA/Adapter_Activator/server.cpp @@ -61,7 +61,8 @@ public: CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException); CORBA::PolicyList first_poa_policies_; CORBA::PolicyList second_poa_policies_; @@ -83,6 +84,7 @@ CORBA::Boolean Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException) { if (ACE_OS::strcmp (name, "firstPOA") == 0) { diff --git a/TAO/examples/POA/Forwarding/Servant_Locator.cpp b/TAO/examples/POA/Forwarding/Servant_Locator.cpp index 0cff08c1ad9..eaa3a429b8c 100644 --- a/TAO/examples/POA/Forwarding/Servant_Locator.cpp +++ b/TAO/examples/POA/Forwarding/Servant_Locator.cpp @@ -45,6 +45,8 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid, const char * /*operation*/, PortableServer::ServantLocator::Cookie & /* cookie */ TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; @@ -98,6 +100,7 @@ MyFooServantLocator::postinvoke (const PortableServer::ObjectId &, PortableServer::ServantLocator::Cookie , PortableServer::Servant TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/examples/POA/Forwarding/Servant_Locator.h b/TAO/examples/POA/Forwarding/Servant_Locator.h index 9495d24e0b3..78a94976af3 100644 --- a/TAO/examples/POA/Forwarding/Servant_Locator.h +++ b/TAO/examples/POA/Forwarding/Servant_Locator.h @@ -38,7 +38,9 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request // for MyFoo object that is not currently active. @@ -47,7 +49,8 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp index 8f52cbb8d87..e6bc62b8cdc 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.cpp +++ b/TAO/examples/POA/Loader/Servant_Activator.cpp @@ -63,6 +63,8 @@ PortableServer::Servant ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; @@ -88,6 +90,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid, CORBA::Boolean, CORBA::Boolean remaining_activations TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated // with MyFooServant object, deactivate it by calling the garbage_collection_function. diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h index 95a0a186b62..bcd079f945e 100644 --- a/TAO/examples/POA/Loader/Servant_Activator.h +++ b/TAO/examples/POA/Loader/Servant_Activator.h @@ -59,7 +59,9 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and // RETAIN policies, whenever it receives a request for a // MyFooServant object that is not currently active. When an servant @@ -75,7 +77,8 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. This occurs when the POA is destroyed or the // Object is deactivated. When the POA is getting destroyed, it diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp index ff7001b88c8..77c4e7e67f0 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.cpp +++ b/TAO/examples/POA/Loader/Servant_Locator.cpp @@ -68,6 +68,8 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; @@ -99,6 +101,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. PortableServer::Servant my_servant = diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h index ca93ed482b2..703a90115a8 100644 --- a/TAO/examples/POA/Loader/Servant_Locator.h +++ b/TAO/examples/POA/Loader/Servant_Locator.h @@ -63,7 +63,9 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request // for MyFoo object that is not currently active. When the POA is // created using the NON_RETAIN policy the Active Object Map is not @@ -79,7 +81,8 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. As the Servant Loactor interface is used when the POA // doesnt maintain the Active Object Map, its necessary to get rid diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp index 914c502757c..2b95b632967 100644 --- a/TAO/examples/POA/NewPOA/NewPOA.cpp +++ b/TAO/examples/POA/NewPOA/NewPOA.cpp @@ -31,7 +31,7 @@ print_poa (PortableServer::POA_ptr poa, { CORBA::String_var poa_name = poa->the_name (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "%s\n", @@ -39,7 +39,7 @@ print_poa (PortableServer::POA_ptr poa, PortableServer::POAList_var children = poa->the_children (ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; for (CORBA::ULong index = 0; index != children->length (); @@ -47,7 +47,7 @@ print_poa (PortableServer::POA_ptr poa, { print_poa (children[index].in (), ACE_TRY_ENV); - ACE_TRY_CHECK; + ACE_CHECK; } } diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp index 8a70eb253cb..1266c4eaff9 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp @@ -31,6 +31,8 @@ PortableServer::Servant MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; // Convert ObjectId to String. @@ -59,6 +61,7 @@ MyFooServantActivator::etherealize (const PortableServer::ObjectId &, CORBA::Boolean , CORBA::Boolean remaining_activations TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated // with MyFooServant delete it. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h index 3b1fcdbc275..353525246a0 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h @@ -25,7 +25,9 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and // RETAIN policies , whenever it receives a request for a MyFoo // object that is not currently active. @@ -35,7 +37,8 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp index 810a842ef5a..2511134c251 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp @@ -35,6 +35,8 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; @@ -73,6 +75,7 @@ MyFooServantLocator::postinvoke (const PortableServer::ObjectId & /* oid */, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h index ff62ec690f9..7572d7da13d 100644 --- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h +++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h @@ -32,7 +32,9 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request // for MyFoo object that is not currently active. @@ -41,7 +43,8 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp index f3032c9e495..3f6f762fd9d 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp @@ -34,6 +34,8 @@ PortableServer::Servant ServantActivator_i::incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; // Convert ObjectId to String. @@ -62,6 +64,7 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid, CORBA::Boolean, CORBA::Boolean remaining_activations TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // If there are no remaining activations i.e ObjectIds associated // with MyFooServant object, deactivate it. Etheralization happens diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h index 47aa9ceda35..0ce43922984 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h @@ -38,7 +38,9 @@ public: virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by a POA with USE_SERVANT_MANAGER and // RETAIN policies, whenever it receives a request for a // MyFooServant object that is not currently active. When an servant @@ -54,7 +56,8 @@ public: PortableServer::Servant servant, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant for a MyFoo object // is deactivated. This occurs when the POA is destroyed or the // Object is deactivated. When the POA is getting destroyed, it diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp index d74d457615f..0ec58cd5043 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp @@ -36,6 +36,8 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid, const char * /* operation */, PortableServer::ServantLocator::Cookie &cookie TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; @@ -75,6 +77,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid, PortableServer::ServantLocator::Cookie cookie, PortableServer::Servant servant TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Check the passed servant with the cookie. diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h index 933288d08d6..5efee2c24f8 100644 --- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h +++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h @@ -43,7 +43,9 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request // for MyFoo object that is not currently active. When the POA is // created using the NON_RETAIN policy the Active Object Map is not @@ -59,7 +61,8 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. As the Servant Loactor interface is used when the POA // doesnt maintain the Active Object Map, its necessary to get rid diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp index f07dc101b08..815da53e48b 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp +++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp @@ -18,10 +18,12 @@ IFR_ServantLocator::preinvoke ( PortableServer::ServantLocator::Cookie &cookie TAO_ENV_ARG_DECL ) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; - CORBA::String_var s = + CORBA::String_var s = PortableServer::ObjectId_to_string (oid); ACE_TString full_name (s.in ()); @@ -60,6 +62,7 @@ IFR_ServantLocator::postinvoke ( PortableServer::Servant servant TAO_ENV_ARG_DECL_NOT_USED ) + ACE_THROW_SPEC ((CORBA::SystemException)) { delete servant; } diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.h b/TAO/orbsvcs/IFR_Service/Servant_Locator.h index 27fca17f8c1..a0e631479f2 100644 --- a/TAO/orbsvcs/IFR_Service/Servant_Locator.h +++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.h @@ -44,7 +44,9 @@ public: const char *operation, PortableServer::ServantLocator::Cookie &the_cookie TAO_ENV_ARG_DECL - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by the IFR's POA whenever it receives a request // for an IR object. @@ -55,7 +57,8 @@ public: PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant TAO_ENV_ARG_DECL - ); + ) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever an IR object servant completes a // request. diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp index 2829565260b..ffc38dbfb90 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp @@ -1251,6 +1251,7 @@ CORBA::Boolean IMR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException) { CORBA::PolicyList policies (4); policies.length (4); diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h index a2d39050705..97b907b6d2f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h @@ -50,7 +50,8 @@ public: virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV - = TAO_default_environment ()); + = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException); // Called by the POA when the incoming requested object/POA isn't found. This will // create POAs when needed and will also put a DSI object (IMR_Forwarder) in that POA // as a default servant to handle that request diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp index a7e9c66d4dd..1e14ecfd724 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.cpp @@ -47,6 +47,7 @@ TAO_LB_ReplicaLocator::postinvoke ( PortableServer::ServantLocator::Cookie /* the_cookie */, PortableServer::Servant /* the_servant */ TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // No-op } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h index 4b729e1ff82..9031dbb51fc 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/ReplicaLocator.h @@ -60,7 +60,8 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); private: TAO_LB_LoadBalancer *load_balancer_; diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp index a7e9c66d4dd..1e14ecfd724 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp +++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.cpp @@ -47,6 +47,7 @@ TAO_LB_ReplicaLocator::postinvoke ( PortableServer::ServantLocator::Cookie /* the_cookie */, PortableServer::Servant /* the_servant */ TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { // No-op } diff --git a/TAO/orbsvcs/orbsvcs/ReplicaLocator.h b/TAO/orbsvcs/orbsvcs/ReplicaLocator.h index 4b729e1ff82..9031dbb51fc 100644 --- a/TAO/orbsvcs/orbsvcs/ReplicaLocator.h +++ b/TAO/orbsvcs/orbsvcs/ReplicaLocator.h @@ -60,7 +60,8 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); private: TAO_LB_LoadBalancer *load_balancer_; diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp index bb61f690e10..56740805c3f 100644 --- a/TAO/tao/Object_Adapter.cpp +++ b/TAO/tao/Object_Adapter.cpp @@ -1230,12 +1230,16 @@ TAO_POA_Current_Impl::teardown (void) PortableServer::POA_ptr TAO_POA_Current_Impl::get_POA (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::Current::NoContext)) { return PortableServer::POA::_duplicate (this->poa_); } PortableServer::ObjectId * TAO_POA_Current_Impl::get_object_id (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::Current::NoContext)) { PortableServer::ObjectId *objid = 0; @@ -1254,6 +1258,8 @@ TAO_POA_Current_Impl::orb_core (void) const PortableServer::POA_ptr TAO_POA_Current::get_POA (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::Current::NoContext)) { TAO_POA_Current_Impl *impl = this->implementation (); @@ -1265,6 +1271,8 @@ TAO_POA_Current::get_POA (CORBA::Environment &ACE_TRY_ENV) PortableServer::ObjectId * TAO_POA_Current::get_object_id (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::Current::NoContext)) { TAO_POA_Current_Impl *impl = this->implementation (); diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h index 9d4f8387128..dbe33564ea4 100644 --- a/TAO/tao/Object_Adapter.h +++ b/TAO/tao/Object_Adapter.h @@ -66,12 +66,16 @@ public: TAO_POA_Current (void); // Constructor - PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV); + PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::Current::NoContext)); // Returns the POA on which the current request is being invoked. // Can raise the <CORBA::NoContext> exception if this function is // not invoked in the context of an upcall. - PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV); + PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::Current::NoContext)); // Returns the object id of the current request being invoked. Can // raise the <CORBA::NoContext> exception if this function is not // invoked in the context of an upcall. @@ -108,11 +112,15 @@ public: friend class TAO_POA; - PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV); + PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::Current::NoContext)); // Return pointer to the invoking POA. Raises the // <CORBA::NoContext> exception. - PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV); + PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::Current::NoContext)); // Return pointer to the object id through which this was invoked. // This may be necessary in cases where a <Servant> is serving under // the guise of multiple object ids. This has _out semantics Raises diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp index 35513fe8caf..30f1187edb8 100644 --- a/TAO/tao/POA.cpp +++ b/TAO/tao/POA.cpp @@ -255,6 +255,9 @@ TAO_POA::create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterAlreadyExists, + PortableServer::POA::InvalidPolicy)) { // If any of the policy objects specified are not valid for the ORB // implementation, if conflicting policy objects are specified, or @@ -303,6 +306,9 @@ TAO_POA::create_POA_i (const TAO_POA::String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policies &policies, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterAlreadyExists, + PortableServer::POA::InvalidPolicy)) { // This operaton creates a new POA as a child of the target POA. The // specified name identifies the new POA with respect to other POAs @@ -376,6 +382,8 @@ PortableServer::POA_ptr TAO_POA::find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterNonExistent)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -402,6 +410,8 @@ TAO_POA * TAO_POA::find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterNonExistent)) { TAO_POA *child; int result = this->children_.find (child_name, @@ -465,6 +475,7 @@ void TAO_POA::destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->cleanup_in_progress_) return; @@ -604,6 +615,8 @@ TAO_POA::the_children_i (CORBA::Environment &ACE_TRY_ENV) PortableServer::ServantManager_ptr TAO_POA::get_servant_manager_i (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // This operation requires the USE_SERVANT_MANAGER policy; if not // present, the WrongPolicy exception is raised. @@ -625,6 +638,8 @@ TAO_POA::get_servant_manager_i (CORBA::Environment &ACE_TRY_ENV) void TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // This operation requires the USE_SERVANT_MANAGER policy; if not // present, the WrongPolicy exception is raised. @@ -661,6 +676,9 @@ TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr, PortableServer::Servant TAO_POA::get_servant_i (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::NoServant, + PortableServer::POA::WrongPolicy)) { // This operation requires the USE_DEFAULT_SERVANT policy; if not // present, the WrongPolicy exception is raised. @@ -710,6 +728,8 @@ TAO_POA::get_servant_i (CORBA::Environment &ACE_TRY_ENV) void TAO_POA::set_servant_i (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // This operation requires the USE_DEFAULT_SERVANT policy; if not // present, the WrongPolicy exception is raised. @@ -833,6 +853,9 @@ PortableServer::ObjectId * TAO_POA::activate_object_i (PortableServer::Servant servant, CORBA::Short priority, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::WrongPolicy)) { // This operation requires the SYSTEM_ID and RETAIN policy; if not // present, the WrongPolicy exception is raised. @@ -898,6 +921,10 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Short priority, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::ObjectAlreadyActive, + PortableServer::POA::WrongPolicy)) { // This operation requires the RETAIN policy; if not present, the // WrongPolicy exception is raised. @@ -1098,6 +1125,9 @@ TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects, void TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) { // This operation requires the RETAIN policy; if not present, the // WrongPolicy exception is raised. @@ -1314,6 +1344,8 @@ CORBA::Object_ptr TAO_POA::create_reference_i (const char *intf, CORBA::Short priority, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // This operation requires the SYSTEM_ID policy; if not present, the // WrongPolicy exception is raised. @@ -1376,6 +1408,8 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, const char *intf, CORBA::Short priority, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // If the POA has the SYSTEM_ID policy and it detects that the // Object Id value was not generated by the system or for this POA, @@ -1450,6 +1484,9 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id, PortableServer::ObjectId * TAO_POA::servant_to_id_i (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)) { // This operation requires the RETAIN and either the UNIQUE_ID or // IMPLICIT_ACTIVATION policies; or it requires the USE_DEFAULT_SERVANT @@ -1563,6 +1600,9 @@ PortableServer::ObjectId * TAO_POA::servant_to_system_id_i (PortableServer::Servant servant, CORBA::Short &priority, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)) { // This operation requires the RETAIN and either the UNIQUE_ID or // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy @@ -1644,6 +1684,9 @@ TAO_POA::servant_to_system_id_i (PortableServer::Servant servant, CORBA::Object_ptr TAO_POA::servant_to_reference (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)) { // Note: The allocation of an Object Id value and installation in // the Active Object Map caused by implicit activation may actually @@ -1672,6 +1715,9 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant, PortableServer::Servant TAO_POA::reference_to_servant (CORBA::Object_ptr reference, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) { // This operation requires the RETAIN policy or the // USE_DEFAULT_SERVANT policy. If neither policy is present, the @@ -1830,6 +1876,9 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference, PortableServer::ObjectId * TAO_POA::reference_to_id (CORBA::Object_ptr reference, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongAdapter, + PortableServer::POA::WrongPolicy)) { // The WrongPolicy exception is declared to allow future extensions. @@ -1900,6 +1949,9 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference, PortableServer::Servant TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) { // This operation requires the RETAIN policy; if not present, the // WrongPolicy exception is raised. @@ -1950,6 +2002,9 @@ TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id, CORBA::Object_ptr TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) { // This operation requires the RETAIN policy; if not present, the // WrongPolicy exception is raised. @@ -2971,6 +3026,7 @@ TAO_POA::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq, PortableServer::ThreadPolicy_ptr TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Thread_Policy *thread_policy = 0; ACE_NEW_THROW_EX (thread_policy, @@ -2986,6 +3042,7 @@ TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value, PortableServer::LifespanPolicy_ptr TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Lifespan_Policy *lifespan_policy = 0; ACE_NEW_THROW_EX (lifespan_policy, @@ -2999,6 +3056,7 @@ TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value, PortableServer::IdUniquenessPolicy_ptr TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Uniqueness_Policy *id_uniqueness_policy = 0; ACE_NEW_THROW_EX (id_uniqueness_policy, @@ -3012,6 +3070,7 @@ TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue va PortableServer::IdAssignmentPolicy_ptr TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Assignment_Policy *id_assignment_policy = 0; ACE_NEW_THROW_EX (id_assignment_policy, @@ -3027,6 +3086,7 @@ TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue va PortableServer::ImplicitActivationPolicy_ptr TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Implicit_Activation_Policy *implicit_activation_policy = 0; ACE_NEW_THROW_EX (implicit_activation_policy, @@ -3040,6 +3100,7 @@ TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPo PortableServer::ServantRetentionPolicy_ptr TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Servant_Retention_Policy *servant_retention_policy = 0; ACE_NEW_THROW_EX (servant_retention_policy, @@ -3053,6 +3114,7 @@ TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicy PortableServer::RequestProcessingPolicy_ptr TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Request_Processing_Policy *request_processing_policy = 0; ACE_NEW_THROW_EX (request_processing_policy, @@ -3074,12 +3136,14 @@ TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value) PortableServer::ThreadPolicyValue TAO_Thread_Policy::value (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr TAO_Thread_Policy::copy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Thread_Policy *thread_policy_copy = 0; ACE_NEW_THROW_EX (thread_policy_copy, @@ -3092,11 +3156,13 @@ TAO_Thread_Policy::copy (CORBA::Environment &ACE_TRY_ENV) void TAO_Thread_Policy::destroy (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType TAO_Thread_Policy::policy_type (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::THREAD_POLICY_ID; } @@ -3110,12 +3176,14 @@ TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue va PortableServer::LifespanPolicyValue TAO_Lifespan_Policy::value (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr TAO_Lifespan_Policy::copy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Lifespan_Policy *lifespan_policy_copy = 0; ACE_NEW_THROW_EX (lifespan_policy_copy, @@ -3128,11 +3196,13 @@ TAO_Lifespan_Policy::copy (CORBA::Environment &ACE_TRY_ENV) void TAO_Lifespan_Policy::destroy (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType TAO_Lifespan_Policy::policy_type (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::LIFESPAN_POLICY_ID; } @@ -3144,12 +3214,14 @@ TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniqueness PortableServer::IdUniquenessPolicyValue TAO_Id_Uniqueness_Policy::value (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Uniqueness_Policy *id_uniqueness_policy_copy = 0; ACE_NEW_THROW_EX (id_uniqueness_policy_copy, @@ -3162,11 +3234,13 @@ TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &ACE_TRY_ENV) void TAO_Id_Uniqueness_Policy::destroy (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType TAO_Id_Uniqueness_Policy::policy_type (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::ID_UNIQUENESS_POLICY_ID; } @@ -3178,12 +3252,14 @@ TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignment PortableServer::IdAssignmentPolicyValue TAO_Id_Assignment_Policy::value (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr TAO_Id_Assignment_Policy::copy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Id_Assignment_Policy *id_assignment_policy_copy = 0; ACE_NEW_THROW_EX (id_assignment_policy_copy, @@ -3196,11 +3272,13 @@ TAO_Id_Assignment_Policy::copy (CORBA::Environment &ACE_TRY_ENV) void TAO_Id_Assignment_Policy::destroy (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType TAO_Id_Assignment_Policy::policy_type (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::ID_ASSIGNMENT_POLICY_ID; } @@ -3214,12 +3292,14 @@ TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer:: PortableServer::ImplicitActivationPolicyValue TAO_Implicit_Activation_Policy::value (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr TAO_Implicit_Activation_Policy::copy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Implicit_Activation_Policy *implicit_activation_policy_copy = 0; ACE_NEW_THROW_EX (implicit_activation_policy_copy, @@ -3232,11 +3312,13 @@ TAO_Implicit_Activation_Policy::copy (CORBA::Environment &ACE_TRY_ENV) void TAO_Implicit_Activation_Policy::destroy (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType TAO_Implicit_Activation_Policy::policy_type (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; } @@ -3248,12 +3330,14 @@ TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::Serv PortableServer::ServantRetentionPolicyValue TAO_Servant_Retention_Policy::value (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr TAO_Servant_Retention_Policy::copy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Servant_Retention_Policy *servant_retention_policy_copy = 0; ACE_NEW_THROW_EX (servant_retention_policy_copy, @@ -3266,11 +3350,13 @@ TAO_Servant_Retention_Policy::copy (CORBA::Environment &ACE_TRY_ENV) void TAO_Servant_Retention_Policy::destroy (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType TAO_Servant_Retention_Policy::policy_type (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::SERVANT_RETENTION_POLICY_ID; } @@ -3282,12 +3368,14 @@ TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::Re PortableServer::RequestProcessingPolicyValue TAO_Request_Processing_Policy::value (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->value_; } CORBA::Policy_ptr TAO_Request_Processing_Policy::copy (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Request_Processing_Policy *request_processing_policy_copy = 0; ACE_NEW_THROW_EX (request_processing_policy_copy, @@ -3300,11 +3388,13 @@ TAO_Request_Processing_Policy::copy (CORBA::Environment &ACE_TRY_ENV) void TAO_Request_Processing_Policy::destroy (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { } CORBA::PolicyType TAO_Request_Processing_Policy::policy_type (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::REQUEST_PROCESSING_POLICY_ID; } @@ -3716,6 +3806,7 @@ CORBA::Boolean TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent, const char *name, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Default policies CORBA::PolicyList default_policies; diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h index ec87d4cbfa6..9b505fb2c22 100644 --- a/TAO/tao/POA.h +++ b/TAO/tao/POA.h @@ -73,13 +73,17 @@ class TAO_Export TAO_Thread_Policy : public: TAO_Thread_Policy (PortableServer::ThreadPolicyValue value); - PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: PortableServer::ThreadPolicyValue value_; @@ -94,13 +98,17 @@ class TAO_Export TAO_Lifespan_Policy : public: TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value); - PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: PortableServer::LifespanPolicyValue value_; @@ -113,13 +121,17 @@ class TAO_Export TAO_Id_Uniqueness_Policy : public: TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value); - PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: PortableServer::IdUniquenessPolicyValue value_; @@ -132,13 +144,17 @@ class TAO_Export TAO_Id_Assignment_Policy : public: TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value); - PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: PortableServer::IdAssignmentPolicyValue value_; @@ -153,13 +169,17 @@ class TAO_Export TAO_Implicit_Activation_Policy : public: TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value); - PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: PortableServer::ImplicitActivationPolicyValue value_; @@ -172,13 +192,17 @@ class TAO_Export TAO_Servant_Retention_Policy : public: TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value); - PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: PortableServer::ServantRetentionPolicyValue value_; @@ -191,13 +215,17 @@ class TAO_Export TAO_Request_Processing_Policy : public: TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value); - PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + void destroy (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: PortableServer::RequestProcessingPolicyValue value_; @@ -385,106 +413,162 @@ public: PortableServer::POA_ptr create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterAlreadyExists, + PortableServer::POA::InvalidPolicy)); PortableServer::POA_ptr find_POA (const char *adapter_name, CORBA::Boolean activate_it, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterNonExistent)); void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + char * the_name (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POAList *the_children (CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); - PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void set_servant_manager (PortableServer::ServantManager_ptr imgr, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void set_servant (PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void deactivate_object (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference (const char *intf, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid, const char *intf, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); + PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)); CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)); PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongAdapter, + PortableServer::POA::WrongPolicy)); PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); #if (TAO_HAS_RT_CORBA == 1) @@ -597,20 +681,29 @@ protected: PortableServer::POA_ptr create_POA_i (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterAlreadyExists, + PortableServer::POA::InvalidPolicy)); TAO_POA *create_POA_i (const String &adapter_name, TAO_POA_Manager &poa_manager, const TAO_POA_Policies &policies, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterAlreadyExists, + PortableServer::POA::InvalidPolicy)); TAO_POA *find_POA_i (const ACE_CString &child_name, CORBA::Boolean activate_it, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterNonExistent)); void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); void complete_destruction_i (CORBA::Environment &ACE_TRY_ENV); @@ -619,15 +712,23 @@ protected: #if (TAO_HAS_MINIMUM_POA == 0) - PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &ACE_TRY_ENV); + PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void set_servant_manager_i (PortableServer::ServantManager_ptr imgr, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); - PortableServer::Servant get_servant_i (CORBA_Environment &ACE_TRY_ENV); + PortableServer::Servant get_servant_i (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void set_servant_i (PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ @@ -661,19 +762,27 @@ protected: PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant, CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void activate_object_with_id_i (const PortableServer::ObjectId &id, PortableServer::Servant p_servant, CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA::Environment &ACE_TRY_ENV); + CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); void wait_for_completions (CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV); @@ -681,37 +790,58 @@ protected: void check_poa_manager_state (CORBA::Environment &ACE_TRY_ENV); void deactivate_object_i (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry, CORBA::Environment &ACE_TRY_ENV); CORBA::Object_ptr create_reference_i (const char *intf, CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid, const char *intf, CORBA::Short priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant, CORBA::Short &priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)); PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant, CORBA::Short &priority, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)); PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid, - CORBA_Environment &ACE_TRY_ENV); - + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)); // // Forwarding related. // @@ -901,7 +1031,8 @@ public: CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i index 53e9740998c..8cfd90fb199 100644 --- a/TAO/tao/POA.i +++ b/TAO/tao/POA.i @@ -281,6 +281,9 @@ TAO_POA::create_POA (const char *adapter_name, PortableServer::POAManager_ptr poa_manager, const CORBA::PolicyList &policies, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::AdapterAlreadyExists, + PortableServer::POA::InvalidPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -295,6 +298,7 @@ ACE_INLINE void TAO_POA::destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_Guard poa_guard (*this, ACE_TRY_ENV, 0); @@ -322,6 +326,8 @@ TAO_POA::active_object_map (void) const ACE_INLINE PortableServer::ServantManager_ptr TAO_POA::get_servant_manager (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ()); @@ -332,6 +338,8 @@ TAO_POA::get_servant_manager (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE void TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -342,6 +350,9 @@ TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr, ACE_INLINE PortableServer::Servant TAO_POA::get_servant (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::NoServant, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -352,6 +363,8 @@ TAO_POA::get_servant (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE void TAO_POA::set_servant (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -365,6 +378,9 @@ TAO_POA::set_servant (PortableServer::Servant servant, ACE_INLINE PortableServer::ObjectId * TAO_POA::activate_object (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -378,6 +394,10 @@ ACE_INLINE void TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantAlreadyActive, + PortableServer::POA::ObjectAlreadyActive, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -391,6 +411,9 @@ TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id, ACE_INLINE void TAO_POA::deactivate_object (const PortableServer::ObjectId &oid, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -402,6 +425,8 @@ TAO_POA::deactivate_object (const PortableServer::ObjectId &oid, ACE_INLINE CORBA::Object_ptr TAO_POA::create_reference (const char *intf, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); @@ -415,6 +440,8 @@ ACE_INLINE CORBA::Object_ptr TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id, const char *intf, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (CORBA::Object::_nil ()); @@ -428,6 +455,9 @@ TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id, ACE_INLINE PortableServer::ObjectId * TAO_POA::servant_to_id (PortableServer::Servant servant, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)) { // If we had upgradeable locks, this would initially be a read lock // @@ -442,6 +472,9 @@ ACE_INLINE PortableServer::ObjectId * TAO_POA::servant_to_system_id (PortableServer::Servant servant, CORBA::Short &priority, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ServantNotActive, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -454,6 +487,9 @@ TAO_POA::servant_to_system_id (PortableServer::Servant servant, ACE_INLINE PortableServer::Servant TAO_POA::id_to_servant (const PortableServer::ObjectId &oid, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -465,6 +501,9 @@ TAO_POA::id_to_servant (const PortableServer::ObjectId &oid, ACE_INLINE CORBA::Object_ptr TAO_POA::id_to_reference (const PortableServer::ObjectId &oid, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POA::ObjectNotActive, + PortableServer::POA::WrongPolicy)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -581,6 +620,7 @@ TAO_POA::forward_object (const PortableServer::ObjectId &oid, ACE_INLINE PortableServer::POA_ptr TAO_POA::the_parent (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { if (this->parent_ != 0) return PortableServer::POA::_duplicate (this->parent_); @@ -600,6 +640,7 @@ TAO_POA::the_children (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE PortableServer::POAManager_ptr TAO_POA::the_POAManager (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POAManager::_duplicate (&this->poa_manager_); } @@ -608,6 +649,7 @@ TAO_POA::the_POAManager (CORBA::Environment &) ACE_INLINE PortableServer::AdapterActivator_ptr TAO_POA::the_activator (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ()); @@ -618,6 +660,7 @@ TAO_POA::the_activator (CORBA::Environment &ACE_TRY_ENV) ACE_INLINE void TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access for the duration of this transaction. TAO_POA_GUARD; @@ -661,6 +704,7 @@ TAO_POA::name (void) const ACE_INLINE char * TAO_POA::the_name (CORBA::Environment &) + ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup (this->name_.c_str ()); } diff --git a/TAO/tao/POAManager.cpp b/TAO/tao/POAManager.cpp index 0412cfa2b46..bc57280f7fe 100644 --- a/TAO/tao/POAManager.cpp +++ b/TAO/tao/POAManager.cpp @@ -25,6 +25,8 @@ TAO_POA_Manager::~TAO_POA_Manager (void) void TAO_POA_Manager::activate_i (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)) { // This operation changes the state of the POA manager to active. If // issued while the POA manager is in the inactive state, the @@ -45,6 +47,8 @@ void TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (wait_for_completion, @@ -115,6 +119,8 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects, void TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (wait_for_completion, @@ -168,6 +174,8 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion, void TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)) { // Is the <wait_for_completion> semantics for this thread correct? TAO_POA::check_for_valid_wait_for_completions (wait_for_completion, diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h index c853e2bf560..c17bc351253 100644 --- a/TAO/tao/POAManager.h +++ b/TAO/tao/POAManager.h @@ -54,23 +54,32 @@ class TAO_Export TAO_POA_Manager : public: - void activate (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + void activate (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)); #if (TAO_HAS_MINIMUM_POA == 0) void hold_requests (CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)); void discard_requests (CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)); void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()); + PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()) + ACE_THROW_SPEC ((CORBA::SystemException)); TAO_POA_Manager (TAO_Object_Adapter &object_adapter); @@ -78,23 +87,32 @@ public: protected: - void activate_i (CORBA_Environment &ACE_TRY_ENV); + void activate_i (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)); void deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)); #if (TAO_HAS_MINIMUM_POA == 0) void hold_requests_i (CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)); void discard_requests_i (CORBA::Boolean wait_for_completion, - CORBA_Environment &ACE_TRY_ENV); + CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)); #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::POAManager::State get_state_i (); + PortableServer::POAManager::State get_state_i () + ACE_THROW_SPEC ((CORBA::SystemException)); ACE_Lock &lock (void); diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i index c91cfbf35a7..8977b773bbd 100644 --- a/TAO/tao/POAManager.i +++ b/TAO/tao/POAManager.i @@ -10,6 +10,8 @@ TAO_POA_Manager::lock (void) ACE_INLINE void TAO_POA_Manager::activate (CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; @@ -22,6 +24,8 @@ TAO_POA_Manager::activate (CORBA_Environment &ACE_TRY_ENV) ACE_INLINE void TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; @@ -32,6 +36,8 @@ TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion, ACE_INLINE void TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; @@ -43,6 +49,8 @@ ACE_INLINE void TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::POAManager::AdapterInactive)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; @@ -56,12 +64,14 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, ACE_INLINE PortableServer::POAManager::State TAO_POA_Manager::get_state_i (void) + ACE_THROW_SPEC ((CORBA::SystemException)) { return this->state_; } ACE_INLINE PortableServer::POAManager::State TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV) + ACE_THROW_SPEC ((CORBA::SystemException)) { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_); diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 4afa053b78d..ff56d0e9633 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -398,11 +398,7 @@ CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow ( } if (CORBA::is_nil (default_proxy)) ACE_NEW_RETURN (default_proxy, CORBA_Policy (stub), CORBA_Policy::_nil ()); - #if (TAO_HAS_SMART_PROXIES == 1) - return TAO_CORBA_Policy_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); - #else return default_proxy; - #endif /*TAO_HAS_SMART_PROXIES == 1*/ } else return diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp index 3313e9d2a81..dccf083b80b 100644 --- a/TAO/tao/PolicyS.cpp +++ b/TAO/tao/PolicyS.cpp @@ -24,7 +24,7 @@ private: public: const TAO_operation_db_entry * lookup (const char *str, unsigned int len); }; -/* starting time is 0:40:21 */ +/* starting time is 6:18:45 */ /* C++ code produced by gperf version 2.8 (ACE version) */ /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup */ unsigned int @@ -119,7 +119,7 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len } return 0; } -/* ending time is 0:40:21 */ +/* ending time is 6:18:45 */ static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable; CORBA_Policy_ptr _TAO_collocation_POA_CORBA_Policy_Stub_Factory ( @@ -496,16 +496,7 @@ if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Policy:1.0") == 0) void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - TAO_Skeleton skel; // pointer to skeleton for operation - const char *opname = req.operation (); // retrieve operation name - // find the skeleton corresponding to this opname - if (this->_find (opname, skel, req.operation_length ()) == -1) - { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION ()); - } - else - skel (req, this, context, ACE_TRY_ENV); + this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV); } const char* POA_CORBA::Policy::_interface_repository_id (void) const diff --git a/TAO/tao/PortableServerC.h b/TAO/tao/PortableServerC.h index 1fc4911ce66..2d789beb07f 100644 --- a/TAO/tao/PortableServerC.h +++ b/TAO/tao/PortableServerC.h @@ -456,14 +456,15 @@ TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVANT_RETENTION_POLICY_ID; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PROCESSING_POLICY_ID; -#if (TAO_HAS_MINIMUM_POA == 0) - enum ThreadPolicyValue { ORB_CTRL_MODEL, SINGLE_THREAD_MODEL, ThreadPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF }; + +#if (TAO_HAS_MINIMUM_POA == 0) + typedef ThreadPolicyValue &ThreadPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue; @@ -976,14 +977,15 @@ private: #endif /* end #if !defined */ -#if (TAO_HAS_MINIMUM_POA == 0) - enum ImplicitActivationPolicyValue { IMPLICIT_ACTIVATION, NO_IMPLICIT_ACTIVATION, ImplicitActivationPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF }; + +#if (TAO_HAS_MINIMUM_POA == 0) + typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; diff --git a/TAO/tao/diffs/PolicyC.cpp.diff b/TAO/tao/diffs/PolicyC.cpp.diff index 6f0c69cf0a2..5e7c4c0631f 100644 --- a/TAO/tao/diffs/PolicyC.cpp.diff +++ b/TAO/tao/diffs/PolicyC.cpp.diff @@ -1,5 +1,5 @@ ---- PolicyC.cpp Wed Jul 05 08:47:48 2000 -+++ PolicyC.cpp.mod Wed Jul 05 08:42:42 2000 +--- PolicyC.cpp Fri Jul 14 06:06:05 2000 ++++ PolicyC.cpp.mod Fri Jul 14 06:02:43 2000 @@ -7,52 +7,40 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html @@ -103,7 +103,21 @@ ACE_CHECK_RETURN (CORBA_Policy::_nil ()); if (is_a == 0) return CORBA_Policy::_nil (); -@@ -786,7 +774,7 @@ +@@ -409,12 +397,8 @@ + default_proxy = _TAO_collocation_CORBA_Policy_Stub_Factory_function_pointer (obj); + } + if (CORBA::is_nil (default_proxy)) +- ACE_NEW_RETURN (default_proxy, ::CORBA_Policy (stub), CORBA_Policy::_nil ()); +- #if (TAO_HAS_SMART_PROXIES == 1) +- return TAO_CORBA_Policy_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy); +- #else ++ ACE_NEW_RETURN (default_proxy, CORBA_Policy (stub), CORBA_Policy::_nil ()); + return default_proxy; +- #endif /*TAO_HAS_SMART_PROXIES == 1*/ + } + else + return +@@ -786,7 +770,7 @@ CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) { if ( @@ -112,7 +126,7 @@ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0"))) return 1; // success using local knowledge else -@@ -811,7 +799,19 @@ +@@ -811,7 +795,19 @@ const char* CORBA_Policy::_interface_repository_id (void) const { @@ -133,7 +147,7 @@ } static const CORBA::Long _oc_CORBA_Policy[] = -@@ -1156,75 +1156,7 @@ +@@ -1156,75 +1152,7 @@ const char* CORBA_PolicyManager::_interface_repository_id (void) const { @@ -210,7 +224,7 @@ } -@@ -1316,7 +1248,7 @@ +@@ -1316,7 +1244,7 @@ const char* CORBA_PolicyCurrent::_interface_repository_id (void) const { @@ -219,7 +233,7 @@ } void operator<<= (CORBA::Any &_tao_any, CORBA::SetOverrideType _tao_elem) -@@ -1419,7 +1351,7 @@ +@@ -1419,7 +1347,7 @@ return 0; if (ACE_OS::strcmp ( interface_repository_id.in (), @@ -228,7 +242,7 @@ return 0; if (stream >> *tmp) { -@@ -1507,7 +1439,7 @@ +@@ -1507,7 +1435,7 @@ return 0; if (ACE_OS::strcmp ( interface_repository_id.in (), @@ -237,7 +251,7 @@ return 0; if (stream >> *tmp) { -@@ -1782,13 +1714,6 @@ +@@ -1782,13 +1710,6 @@ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ defined (ACE_HAS_GNU_REPO) @@ -251,7 +265,7 @@ template class TAO_Object_Manager<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO_Object_Manager<CORBA_PolicyCurrent,CORBA_PolicyCurrent_var> -@@ -1905,4 +1830,3 @@ +@@ -1905,4 +1826,3 @@ } return 0; // error } diff --git a/TAO/tao/diffs/PolicyS.cpp.diff b/TAO/tao/diffs/PolicyS.cpp.diff index 1814441e2a1..d9caa4f33b8 100644 --- a/TAO/tao/diffs/PolicyS.cpp.diff +++ b/TAO/tao/diffs/PolicyS.cpp.diff @@ -1,5 +1,5 @@ ---- PolicyS.cpp Sat Jun 24 03:24:53 2000 -+++ PolicyS.cpp.mod Sat Jun 24 03:23:51 2000 +--- PolicyS.cpp Fri Jul 14 06:18:45 2000 ++++ PolicyS.cpp.mod Fri Jul 14 06:18:30 2000 @@ -7,12 +7,16 @@ // Information about TAO is available at: // http://www.cs.wustl.edu/~schmidt/TAO.html @@ -164,7 +164,7 @@ const char* value, CORBA::Environment &ACE_TRY_ENV ) -@@ -479,18 +483,18 @@ +@@ -479,29 +483,29 @@ return 0; } @@ -184,10 +184,7 @@ -void POA_CORBA_Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) +void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - TAO_Skeleton skel; // pointer to skeleton for operation - const char *opname = req.operation (); // retrieve operation name -@@ -504,13 +508,13 @@ - skel (req, this, context, ACE_TRY_ENV); + this->synchronous_upcall_dispatch(req, context, this, ACE_TRY_ENV); } -const char* POA_CORBA_Policy::_interface_repository_id (void) const @@ -202,7 +199,7 @@ { TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV); ACE_CHECK_RETURN (0); -@@ -522,7 +526,7 @@ +@@ -513,7 +517,7 @@ ::CORBA_Policy_ptr retval = 0; ACE_NEW_RETURN ( retval, @@ -211,7 +208,7 @@ 0 ); return retval; -@@ -542,14 +546,14 @@ +@@ -533,14 +537,14 @@ } } @@ -228,7 +225,7 @@ const CORBA::Char *logical_type_id, CORBA_Environment &ACE_TRY_ENV ) -@@ -565,7 +569,7 @@ +@@ -556,7 +560,7 @@ ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -237,7 +234,7 @@ servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA_Policy:1.0" ) -@@ -573,7 +577,7 @@ +@@ -564,7 +568,7 @@ } @@ -246,7 +243,7 @@ CORBA_Environment &ACE_TRY_ENV ) -@@ -588,7 +592,7 @@ +@@ -579,7 +583,7 @@ ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -255,7 +252,7 @@ servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA_Policy:1.0" ) -@@ -596,7 +600,7 @@ +@@ -587,7 +591,7 @@ } @@ -264,7 +261,7 @@ CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( -@@ -615,7 +619,7 @@ +@@ -606,7 +610,7 @@ ); ACE_CHECK_RETURN (_tao_retval); return ACE_reinterpret_cast ( @@ -273,7 +270,7 @@ servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA_Policy:1.0" ) -@@ -625,7 +629,7 @@ +@@ -616,7 +620,7 @@ } @@ -282,7 +279,7 @@ CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( -@@ -644,7 +648,7 @@ +@@ -635,7 +639,7 @@ ); ACE_CHECK_RETURN (0); return ACE_reinterpret_cast ( @@ -291,7 +288,7 @@ servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA_Policy:1.0" ) -@@ -654,7 +658,7 @@ +@@ -645,7 +649,7 @@ } @@ -300,7 +297,7 @@ CORBA::Environment &ACE_TRY_ENV ) ACE_THROW_SPEC (( -@@ -671,7 +675,7 @@ +@@ -662,7 +666,7 @@ ); ACE_CHECK; ACE_reinterpret_cast ( @@ -309,7 +306,7 @@ servant_upcall.servant ()->_downcast ( "IDL:omg.org/CORBA_Policy:1.0" ) -@@ -680,6 +684,3 @@ +@@ -671,6 +675,3 @@ ); return; } diff --git a/TAO/tao/diffs/PortableServerC.h.diff b/TAO/tao/diffs/PortableServerC.h.diff index 9dff1bbe2c4..bb0e558d9bb 100644 --- a/TAO/tao/diffs/PortableServerC.h.diff +++ b/TAO/tao/diffs/PortableServerC.h.diff @@ -1,5 +1,11 @@ ---- PortableServerC.h Tue Jul 11 01:25:50 2000 -+++ PortableServerC.h.mod Tue Jul 11 01:16:35 2000 +--- PortableServerC.h Fri Jul 14 06:41:41 2000 ++++ PortableServerC.h.mod Fri Jul 14 06:39:07 2000 +@@ -1,4 +1,4 @@ +-/* -*- C++ -*- $Id$ */ ++/* -*- C++ -*- $Id$ */ + + // ****** Code generated by the The ACE ORB (TAO) IDL Compiler ******* + // TAO and the TAO IDL Compiler have been developed by the Center for @@ -11,7 +11,7 @@ #define _TAO_IDL_PORTABLESERVERC_H_ @@ -78,16 +84,17 @@ TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID; TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID; -@@ -435,6 +456,8 @@ - - TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PROCESSING_POLICY_ID; - +@@ -441,6 +462,9 @@ + SINGLE_THREAD_MODEL, + ThreadPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF + }; ++ +#if (TAO_HAS_MINIMUM_POA == 0) + - enum ThreadPolicyValue - { - ORB_CTRL_MODEL, -@@ -564,6 +587,8 @@ + typedef ThreadPolicyValue &ThreadPolicyValue_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue; + +@@ -564,6 +588,8 @@ #endif /* end #if !defined */ @@ -96,16 +103,17 @@ enum LifespanPolicyValue { TRANSIENT, -@@ -951,6 +976,8 @@ - - #endif /* end #if !defined */ - +@@ -957,6 +983,9 @@ + NO_IMPLICIT_ACTIVATION, + ImplicitActivationPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF + }; ++ +#if (TAO_HAS_MINIMUM_POA == 0) + - enum ImplicitActivationPolicyValue - { - IMPLICIT_ACTIVATION, -@@ -1080,12 +1107,17 @@ + typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out; + TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue; + +@@ -1080,12 +1109,17 @@ #endif /* end #if !defined */ @@ -123,7 +131,7 @@ typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue; -@@ -1209,6 +1241,8 @@ +@@ -1209,6 +1243,8 @@ #endif /* end #if !defined */ @@ -132,7 +140,7 @@ enum RequestProcessingPolicyValue { USE_ACTIVE_OBJECT_MAP_ONLY, -@@ -1216,6 +1250,9 @@ +@@ -1216,6 +1252,9 @@ USE_SERVANT_MANAGER, RequestProcessingPolicyValue_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF }; @@ -142,7 +150,7 @@ typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out; TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue; -@@ -1339,6 +1376,7 @@ +@@ -1339,6 +1378,7 @@ #endif /* end #if !defined */ @@ -150,7 +158,7 @@ #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_) #define _PORTABLESERVER_POAMANAGER___PTR_CH_ -@@ -1489,6 +1527,8 @@ +@@ -1489,6 +1529,8 @@ PortableServer::POAManager::AdapterInactive )) = 0; @@ -159,7 +167,7 @@ virtual void hold_requests ( CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV = -@@ -1520,6 +1560,8 @@ +@@ -1520,6 +1562,8 @@ PortableServer::POAManager::AdapterInactive )) = 0; @@ -168,7 +176,7 @@ virtual PortableServer::POAManager::State get_state ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () -@@ -1544,6 +1586,8 @@ +@@ -1544,6 +1588,8 @@ #endif /* end #if !defined */ @@ -177,7 +185,7 @@ #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_) #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_ -@@ -1876,23 +1920,27 @@ +@@ -1876,23 +1922,27 @@ virtual PortableServer::Servant incarnate ( const PortableServer::ObjectId & oid, @@ -211,7 +219,7 @@ ) ACE_THROW_SPEC (( CORBA::SystemException -@@ -1988,6 +2036,9 @@ +@@ -1988,6 +2038,9 @@ class TAO_Export ServantLocator: public virtual ServantManager { public: @@ -221,7 +229,7 @@ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8) typedef ServantLocator_ptr _ptr_type; typedef ServantLocator_var _var_type; -@@ -2014,23 +2065,27 @@ +@@ -2014,23 +2067,27 @@ const PortableServer::ObjectId & oid, PortableServer::POA_ptr adapter, const char * operation, @@ -255,7 +263,7 @@ ) ACE_THROW_SPEC (( CORBA::SystemException -@@ -2052,6 +2107,8 @@ +@@ -2052,6 +2109,8 @@ #endif /* end #if !defined */ @@ -264,7 +272,7 @@ #if !defined (_PORTABLESERVER_POA___PTR_CH_) #define _PORTABLESERVER_POA___PTR_CH_ -@@ -2258,6 +2315,8 @@ +@@ -2258,6 +2317,8 @@ #endif /* end #if !defined */ @@ -273,7 +281,7 @@ #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_) #define _PORTABLESERVER_POA_NOSERVANT_CH_ -@@ -2292,6 +2351,7 @@ +@@ -2292,6 +2353,7 @@ #endif /* end #if !defined */ @@ -281,7 +289,7 @@ #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_) #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_ -@@ -2536,6 +2596,8 @@ +@@ -2536,6 +2598,8 @@ CORBA::SystemException )) = 0; @@ -290,7 +298,7 @@ virtual PortableServer::ThreadPolicy_ptr create_thread_policy ( PortableServer::ThreadPolicyValue value, CORBA::Environment &ACE_TRY_ENV = -@@ -2545,6 +2607,8 @@ +@@ -2545,6 +2609,8 @@ CORBA::SystemException )) = 0; @@ -299,7 +307,7 @@ virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy ( PortableServer::LifespanPolicyValue value, CORBA::Environment &ACE_TRY_ENV = -@@ -2572,6 +2636,8 @@ +@@ -2572,6 +2638,8 @@ CORBA::SystemException )) = 0; @@ -308,7 +316,7 @@ virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy ( PortableServer::ImplicitActivationPolicyValue value, CORBA::Environment &ACE_TRY_ENV = -@@ -2599,6 +2665,8 @@ +@@ -2599,6 +2667,8 @@ CORBA::SystemException )) = 0; @@ -317,7 +325,7 @@ virtual char * the_name ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () -@@ -2631,6 +2699,8 @@ +@@ -2631,6 +2701,8 @@ CORBA::SystemException )) = 0; @@ -326,7 +334,7 @@ virtual PortableServer::AdapterActivator_ptr the_activator ( CORBA::Environment &ACE_TRY_ENV = TAO_default_environment () -@@ -2687,6 +2757,8 @@ +@@ -2687,6 +2759,8 @@ PortableServer::POA::WrongPolicy )) = 0; @@ -335,7 +343,7 @@ virtual PortableServer::ObjectId * activate_object ( PortableServer::Servant p_servant, CORBA::Environment &ACE_TRY_ENV = -@@ -2989,6 +3061,10 @@ +@@ -2989,6 +3063,10 @@ #endif /* end #if !defined */ @@ -346,7 +354,7 @@ } TAO_NAMESPACE_CLOSE // module PortableServer -@@ -2997,18 +3073,32 @@ +@@ -2997,18 +3075,32 @@ TAO_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&); @@ -379,7 +387,7 @@ TAO_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &); TAO_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue); -@@ -3016,6 +3106,8 @@ +@@ -3016,6 +3108,8 @@ TAO_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue); TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &); @@ -388,7 +396,7 @@ #ifndef __ACE_INLINE__ -@@ -3033,28 +3125,47 @@ +@@ -3033,28 +3127,47 @@ #endif /* _TAO_CDR_OP_PortableServer_ObjectId_H_ */ diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp index c216119fd68..87751adb169 100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.cpp @@ -39,10 +39,12 @@ Servant_Locator::~Servant_Locator () PortableServer::Servant Servant_Locator::preinvoke (const PortableServer::ObjectId &oid, - PortableServer::POA_ptr /* poa_ptr */, - const char * /*operation*/, - PortableServer::ServantLocator::Cookie & /* cookie */ + PortableServer::POA_ptr /* poa_ptr */, + const char * /*operation*/, + PortableServer::ServantLocator::Cookie & /* cookie */ TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)) { TAO_ENV_ARG_DEFN; @@ -80,6 +82,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &, PortableServer::ServantLocator::Cookie , PortableServer::Servant TAO_ENV_ARG_DECL_NOT_USED) + ACE_THROW_SPEC ((CORBA::SystemException)) { } diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h index f251a33b662..e658098f99c 100755 --- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h +++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h @@ -38,7 +38,9 @@ public: PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie &the_cookie - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException, + PortableServer::ForwardRequest)); // This method is invoked by a POA whenever it receives a request // for MyFoo object that is not currently active. @@ -47,7 +49,8 @@ public: const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant - TAO_ENV_ARG_DECL); + TAO_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); // This method is invoked whenever a MyFooServant completes a // request. |