Mon Feb 12 11:40:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 29 insertions, 108 deletions

diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
index d2b11d0485c..b0cdb5507ea 100644
--- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp
@@ -23,14 +23,12 @@ Current_Test_Impl::~Current_Test_Impl (void)
 
 ::CORBA::Long
 Current_Test_Impl::self_test (void)
-        ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return 0;
 }
 
 void
 Current_Test_Impl::test_transport_current (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -72,7 +70,6 @@ Current_Test_Impl::test_transport_current (void)
 
 void
 Current_Test_Impl::invoked_by_client (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   try
     {
@@ -92,7 +89,6 @@ Current_Test_Impl::invoked_by_client (void)
 
 void
 Current_Test_Impl::invoked_by_client_i (void)
-  ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -128,7 +124,6 @@ Current_Test_Impl::invoked_by_client_i (void)
 
 void
 Current_Test_Impl::invoked_during_upcall (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -140,7 +135,6 @@ Current_Test_Impl::invoked_during_upcall (void)
 
 void
 Current_Test_Impl::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/TransportCurrent/Framework/Tester.cpp b/TAO/tests/TransportCurrent/Framework/Tester.cpp
index abaa7635727..1bc137d006e 100644
--- a/TAO/tests/TransportCurrent/Framework/Tester.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Tester.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "tao/TransportCurrent/Transport_Current.h"
+#include "tao/SystemException.h"
 
 using namespace TAO;
 
@@ -10,8 +11,6 @@ using namespace TAO;
 
 int
 test_transport_current (Transport::Current_ptr tc)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::UserException))
 {
   CORBA::Long id = tc->id ();
 
@@ -36,8 +35,6 @@ test_transport_current (Transport::Current_ptr tc)
 
 int
 test_transport_current (CORBA::ORB_ptr orb)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::UserException))
 {
   // Get the Current object.
   CORBA::Object_var tcobject =
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index bb9e52f8542..c113ed14627 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -25,14 +25,12 @@ Current_Test_Impl::~Current_Test_Impl (void)
 
 ::CORBA::Long
 Current_Test_Impl::self_test (void)
-        ACE_THROW_SPEC ((::CORBA::SystemException))
 {
   return 0;
 }
 
 void
 Current_Test_Impl::test_transport_current (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -69,7 +67,6 @@ Current_Test_Impl::test_transport_current (void)
 
 void
 Current_Test_Impl::invoked_by_client (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level >= 1) {
     ACE_DEBUG ((LM_DEBUG,
@@ -106,7 +103,6 @@ Current_Test_Impl::invoked_by_client (void)
 
 void
 Current_Test_Impl::invoked_during_upcall (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
@@ -117,7 +113,6 @@ Current_Test_Impl::invoked_during_upcall (void)
 
 void
 Current_Test_Impl::shutdown (void)
-  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 2) {
     ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index 27819ca3900..4c8074d7910 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -27,7 +27,6 @@ namespace Test {
 
   char *
   IIOP_Server_Request_Interceptor::name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("II SRI");
   }
@@ -35,7 +34,6 @@ namespace Test {
   ///
   TAO::Transport::IIOP::Current_ptr
   IIOP_Server_Request_Interceptor::resolve_iiop_transport_current (const char* orbid)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
 
@@ -54,7 +52,6 @@ namespace Test {
   /// as index in an array, where we store the endpoint
   void
   IIOP_Server_Request_Interceptor::push_request_info (size_t requestID)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
 
@@ -169,7 +166,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::inbound_process_context  (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
     CORBA::String_var op (ri->operation());
@@ -208,7 +204,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::outbound_process_context (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     IOP::ServiceId id = Test::Transport::CurrentTest::ContextTag;
 
@@ -228,8 +223,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     try
       {
@@ -251,7 +244,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     try
       {
@@ -273,8 +265,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     try
       {
@@ -297,8 +287,6 @@ namespace Test {
 
   void
   IIOP_Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
   {
     try
       {
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
index d87ec6b1f5d..76f300cf32c 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -55,50 +55,38 @@ namespace Test
      */
     //@{
     /// Return the name of this ServerRequestinterceptor.
-    virtual char * name (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual char * name (void);
 
     /// incomming interception point
-    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr);
 
     /// outgoing interception point
-    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
     /// outgoing interception point
-    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
     /// outgoing interception point
-    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
     //@}
 
   protected:
 
     /// process incomming requests context
     void inbound_process_context
-    (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    (PortableInterceptor::ServerRequestInfo_ptr ri);
 
     /// process outgoing requests context
     void outbound_process_context
-    (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    (PortableInterceptor::ServerRequestInfo_ptr ri);
 
     /// saves the incomming request info
-    void push_request_info (size_t requestID)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    void push_request_info (size_t requestID);
 
     /// clears the outgoing request info
     void pop_request_info (size_t requestID);
 
-    TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    TAO::Transport::IIOP::Current_ptr resolve_iiop_transport_current (const char* orbid);
 
   private:
 
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
index 6544b23169b..ba3162f9b58 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Tester.cpp
@@ -3,6 +3,7 @@
 // $Id$
 
 #include "tao/TransportCurrent/IIOP_Transport_Current.h"
+#include "tao/SystemException.h"
 
 #if defined (TAO_AS_STATIC_LIBS)
 #include "tao/TransportCurrent/IIOP_Current_Loader.h"
@@ -14,7 +15,6 @@ ACE_STATIC_SVC_REQUIRE (TAO_Transport_Current_Loader)
 ACE_STATIC_SVC_REQUIRE (TAO_Transport_IIOP_Current_Loader)
 #endif /* TAO_AS_STATIC_LIBS */
 
-
 using namespace TAO;
 
 
@@ -23,14 +23,11 @@ using namespace TAO;
 
 int
 test_transport_current (CORBA::ORB_ptr orb)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::UserException))
 {
   // Get the Current object.
   CORBA::Object_var tcobject =
     orb->resolve_initial_references (ACE_TEXT_ALWAYS_CHAR ("TAO::Transport::IIOP::Current"));
 
-
   if (TAO_debug_level >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("Tester (%P|%t) Resolved initial reference for IIOP::Current\n")));
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
index c829c3919a4..c2bf2000119 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp
@@ -27,14 +27,12 @@ namespace Test
 
   void
   Client_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /* no-op */
   }
 
   // A specialization to handle client-side interceptors
   void Client_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     oii->add_client_request_interceptor (this->interceptor_.in ());
   }
diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
index b95ef80777b..7c5eb831aab 100644
--- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h
@@ -36,11 +36,9 @@ namespace Test
     Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor);
     virtual ~Client_ORBInitializer (void);
 
-    virtual void pre_init(PortableInterceptor::ORBInitInfo*)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void pre_init(PortableInterceptor::ORBInitInfo*);
 
-    virtual void post_init(PortableInterceptor::ORBInitInfo*)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void post_init(PortableInterceptor::ORBInitInfo*);
 
   private:
     PortableInterceptor::ClientRequestInterceptor_var interceptor_;
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
index 416f20365b5..5a84ba9b191 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp
@@ -30,14 +30,12 @@ namespace Test
 
   char *
   Client_Request_Interceptor::name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("Client_Request_Interceptor");
   }
 
   void
   Client_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod)
-    ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException))
   {
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("CRI    (%P|%t) Test accessing Transport Current from %s\n"),
@@ -61,13 +59,11 @@ namespace Test
 
   void
   Client_Request_Interceptor::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     //Test TC
     test_transport_current ("send_request");
@@ -106,28 +102,24 @@ namespace Test
 
   void
   Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     test_transport_current ("send_poll");
   }
 
   void
   Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     test_transport_current ("receive_reply");
   }
 
   void
   Client_Request_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("receive_exception");
   }
 
   void
   Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("receive_other");
   }
diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
index 97b726a1fd2..a4e2a7999bc 100644
--- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h
@@ -72,21 +72,16 @@ namespace Test
 
     virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
+    virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri);
 
 
-    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
+    virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri);
 
-    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
+    virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr ri);
     //@}
 
     // Number of interceptions
@@ -95,8 +90,7 @@ namespace Test
   private:
     // Implementation method, every inteception point will have to
     // call it, supplying a name.
-    void test_transport_current (const ACE_TCHAR* amethod)
-      ACE_THROW_SPEC ((CORBA::SystemException, CORBA::UserException));
+    void test_transport_current (const ACE_TCHAR* amethod);
 
   private:
     ///The ID of the ORB this interceptor is registered with.
diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
index 2e0a1a8a1bc..af5670ca526 100644
--- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
+++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h
@@ -42,8 +42,7 @@ public:
   /// No-op method used so that a client request interceptor will be
   /// invoked when invoking this method from the above invoke_me()
   /// method.  Say that 10 times fast. :-)
-  virtual void invoked_during_upcall (void)
-    ACE_THROW_SPEC ((::CORBA::SystemException));
+  virtual void invoked_during_upcall (void);
 
   /// Shutdown the ORB.
   virtual void shutdown (void) ACE_THROW_SPEC ((CORBA::SystemException));
@@ -60,8 +59,7 @@ private:
   void test_transport_current (void) ACE_THROW_SPEC ((::CORBA::SystemException));
 
   /// Main servant test method.
-  void invoked_by_client_i (void)
-    ACE_THROW_SPEC ((CORBA::SystemException, TAO::Transport::NoContext));
+  void invoked_by_client_i (void);
 
 private:
   /// Pseudo-reference to the ORB.
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
index e7c4551b6ab..8e866e97052 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp
@@ -27,14 +27,12 @@ namespace Test
 
   void
   Server_ORBInitializer::pre_init(PortableInterceptor::ORBInitInfo*)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     /* no-op */
   }
 
   // A specialization to handle client-side interceptors
   void Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo* oii)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     oii->add_server_request_interceptor (this->interceptor_.in ());
   }
diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
index a39ca925359..e9d517c30bd 100644
--- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
+++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h
@@ -35,11 +35,9 @@ namespace Test
     Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor);
     virtual ~Server_ORBInitializer (void);
 
-    virtual void pre_init(PortableInterceptor::ORBInitInfo*)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void pre_init(PortableInterceptor::ORBInitInfo*);
 
-    virtual void post_init(PortableInterceptor::ORBInitInfo*)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void post_init(PortableInterceptor::ORBInitInfo*);
 
   private:
     PortableInterceptor::ServerRequestInterceptor_var interceptor_;
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
index 024c0f6fe77..c0e7d2c218a 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp
@@ -25,7 +25,6 @@ namespace Test
 
   void
   Server_Request_Interceptor::test_transport_current (const ACE_TCHAR* amethod)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     CORBA::String_var name (this->name ());
     ACE_DEBUG ((LM_DEBUG,
@@ -71,48 +70,41 @@ namespace Test
 
   char *
   Server_Request_Interceptor::name (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     return CORBA::string_dup ("SRI   ");
   }
 
   void
   Server_Request_Interceptor::destroy (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
   }
 
   void
   Server_Request_Interceptor::receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("receive_request_service_contexts");
   }
 
   void
   Server_Request_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("receive_request");
   }
 
   void
   Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException))
   {
     test_transport_current ("send_reply");
   }
 
   void
   Server_Request_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("send_exception");
   }
 
   void
   Server_Request_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr)
-    ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest))
   {
     test_transport_current ("send_other");
   }
diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
index b34c1ec6a4e..7776b86354a 100644
--- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h
@@ -57,8 +57,7 @@ namespace Test
     /// Destructor.
     virtual ~Server_Request_Interceptor (void);
 
-    virtual void test_transport_current (const char* amethod)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void test_transport_current (const char* amethod);
 
     /// Coherency test
     virtual bool self_test (void);
@@ -77,20 +76,15 @@ namespace Test
 
     virtual void destroy (void) ACE_THROW_SPEC ((CORBA::SystemException));
 
-    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
+    virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-    virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
+    virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
+    virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri);
 
-    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri)
-      ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest));
+    virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr ri);
     //@}
 
   protected: