ChangeLogTag: Fri Jul 14 06:50:57 2000 Irfan Pyarali <irfan@cs.wustl.edu>

16 files changed, 62 insertions, 18 deletions

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