ChangeLogTag:Tue Nov 21 12:06:09 2000 Ossama Othman <ossama@uci.edu>

5 files changed, 186 insertions, 175 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 09a9c809f88..667d10da35d 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,25 @@
+Tue Nov 21 12:06:09 2000  Ossama Othman  <ossama@uci.edu>
+
+	* tests/Portable_Interceptors/Benchmark/interceptors.h:	  
+
+	  Interceptors are local objects, so derive (via multiple
+	  inheritance) each interceptor from CORBA::LocalObject.
+
+	* tests/Portable_Interceptors/Benchmark/interceptors.cpp
+	  (receive_request):
+
+	  Throw CORBA::NO_PERMISSION() exception instead of the
+	  "Test_Interceptors::Invalid" exception.  Throwing a user
+	  exception is not allowed since it is not part of the throw spec,
+	  which is dictated by the
+	  PortableInterceptor::ServerRequestInterceptor interface.
+
+	* tests/Portable_Interceptors/Benchmark/README:
+
+	  Updated README.  "Pseudo-portable interceptors" no longer
+	  applies, since TAO now implements the standard Portable
+	  Interceptor interfaces.
+
 Tue Nov 21 13:30:18 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* TAO_IDL/driver/drv_args.cpp:
@@ -38,7 +60,6 @@ Tue Nov 21 13:13:37 2000  Angelo Corsaro  <corsaro@cs.wustl.edu>
 
 	  Source file for the new collocation test.
 
-
 Tue Nov 21 09:40:51 2000  Ossama Othman  <ossama@uci.edu>
 
 	* docs/releasenotes/index.html:
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/README b/TAO/tests/Portable_Interceptors/Benchmark/README
index 4abad34898c..17bd3d2d88d 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/README
+++ b/TAO/tests/Portable_Interceptors/Benchmark/README
@@ -1,7 +1,7 @@
 # $Id$
 
 This test allows you to visually check the correct invocation of
-TAO's pseudo-portable interceptors, especially the Dynamic interface.
+TAO's portable interceptors, especially the Dynamic interface.
 
   To run the test, try:
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
index ebb516eaa36..23d438499d6 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.cpp
@@ -39,20 +39,19 @@ Vault_Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Vault_Client_Request_Interceptor::send_poll (
-                PortableInterceptor::ClientRequestInfo_ptr
-                TAO_ENV_ARG_DECL_NOT_USED
-                )
-      ACE_THROW_SPEC ((CORBA::SystemException))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
 
 void
 Vault_Client_Request_Interceptor::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   if (ACE_OS::strcmp (ri->operation (), "authenticate") == 0)
     {
@@ -81,14 +80,13 @@ Vault_Client_Request_Interceptor::send_request (
       paramlist[0].argument >>= id;
       paramlist[1].argument >>= record;
     }
-
 }
 
 void
 Vault_Client_Request_Interceptor::receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+    PortableInterceptor::ClientRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (ri->operation (), "update_records") == 0)
     {
@@ -96,26 +94,24 @@ Vault_Client_Request_Interceptor::receive_reply (
       CORBA_Any result_any = *(ri->result ());
       result_any >>= result;
     }
-
 }
 
 void
 Vault_Client_Request_Interceptor::receive_other (
-               PortableInterceptor::ClientRequestInfo_ptr
-               TAO_ENV_ARG_DECL_NOT_USED
-               )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
 
 void
 Vault_Client_Request_Interceptor::receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr rinfo
-      TAO_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr rinfo
+    TAO_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   TAO_ENV_ARG_DEFN;
 
@@ -168,8 +164,8 @@ Vault_Server_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Vault_Server_Request_Interceptor::receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -186,8 +182,8 @@ Vault_Server_Request_Interceptor::receive_request (
 
      const char *buf = ACE_reinterpret_cast (const char *,
                                              sc->context_data.get_buffer ());
-     if (ACE_OS::strcmp (buf, "root123") !=0)
-       ACE_THROW (Test_Interceptors::Invalid ());
+     if (ACE_OS::strcmp (buf, "root123") != 0)
+       ACE_THROW (CORBA::NO_PERMISSION ());
     }
 
   if (ACE_OS::strcmp (ri->operation (), "update_records") == 0)
@@ -198,24 +194,22 @@ Vault_Server_Request_Interceptor::receive_request (
       paramlist[0].argument >>= id;
       paramlist[1].argument >>= record;
     }
-
-
 }
 
 void
 Vault_Server_Request_Interceptor::receive_request_service_contexts (
-             PortableInterceptor::ServerRequestInfo_ptr
-             TAO_ENV_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
 
 void
 Vault_Server_Request_Interceptor::send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (ri->operation (), "update_records") == 0)
@@ -228,8 +222,8 @@ Vault_Server_Request_Interceptor::send_reply (
 
 void
 Vault_Server_Request_Interceptor::send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -238,10 +232,10 @@ Vault_Server_Request_Interceptor::send_exception (
 
 void
 Vault_Server_Request_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr
-             TAO_ENV_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
@@ -273,7 +267,8 @@ Vault_Client_Request_Context_Interceptor::_remove_ref (void)
 }
 
 char *
-Vault_Client_Request_Context_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Context_Interceptor::name (
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -281,18 +276,17 @@ Vault_Client_Request_Context_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
 
 void
 Vault_Client_Request_Context_Interceptor::send_poll (
-                PortableInterceptor::ClientRequestInfo_ptr
-                TAO_ENV_ARG_DECL_NOT_USED
-                )
-      ACE_THROW_SPEC ((CORBA::SystemException))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
 
 void
 Vault_Client_Request_Context_Interceptor::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ClientRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -311,35 +305,33 @@ Vault_Client_Request_Context_Interceptor::send_request (
 
   // Add this context to the service context list.
   ri->add_request_service_context (sc, 0);
-
 }
 
 void
 Vault_Client_Request_Context_Interceptor::receive_other (
-               PortableInterceptor::ClientRequestInfo_ptr
-               TAO_ENV_ARG_DECL_NOT_USED
-               )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
 
 void
 Vault_Client_Request_Context_Interceptor::receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
 
 void
 Vault_Client_Request_Context_Interceptor::receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr rinfo
-      TAO_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr rinfo
+    TAO_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   TAO_ENV_ARG_DEFN;
 
@@ -384,7 +376,8 @@ Vault_Server_Request_Context_Interceptor::_remove_ref (void)
 }
 
 char *
-Vault_Server_Request_Context_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Context_Interceptor::name (
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -392,8 +385,8 @@ Vault_Server_Request_Context_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
 
 void
 Vault_Server_Request_Context_Interceptor::receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -408,23 +401,23 @@ Vault_Server_Request_Context_Interceptor::receive_request (
   const char *buf = ACE_reinterpret_cast (const char *,
                                           sc->context_data.get_buffer ());
   if (ACE_OS::strcmp (buf, "root123") !=0)
-    ACE_THROW (Test_Interceptors::Invalid ());
+    ACE_THROW (CORBA::NO_PERMISSION ());
 }
 
 void
 Vault_Server_Request_Context_Interceptor::receive_request_service_contexts(
-             PortableInterceptor::ServerRequestInfo_ptr
-             TAO_ENV_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
 
 void
 Vault_Server_Request_Context_Interceptor::send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -432,8 +425,8 @@ Vault_Server_Request_Context_Interceptor::send_reply (
 
 void
 Vault_Server_Request_Context_Interceptor::send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -441,10 +434,10 @@ Vault_Server_Request_Context_Interceptor::send_exception (
 
 void
 Vault_Server_Request_Context_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr
-             TAO_ENV_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
@@ -475,7 +468,8 @@ Vault_Client_Request_Dynamic_Interceptor::_remove_ref (void)
 }
 
 char *
-Vault_Client_Request_Dynamic_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Client_Request_Dynamic_Interceptor::name (
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -483,20 +477,19 @@ Vault_Client_Request_Dynamic_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
 
 void
 Vault_Client_Request_Dynamic_Interceptor::send_poll (
-                PortableInterceptor::ClientRequestInfo_ptr
-                TAO_ENV_ARG_DECL_NOT_USED
-                )
-      ACE_THROW_SPEC ((CORBA::SystemException))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
 
 void
 Vault_Client_Request_Dynamic_Interceptor::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
  if (ACE_OS::strcmp (ri->operation (), "authenticate") == 0)
     {
@@ -513,14 +506,13 @@ Vault_Client_Request_Dynamic_Interceptor::send_request (
       paramlist[0].argument >>= id;
       paramlist[1].argument >>= record;
     }
-
 }
 
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+    PortableInterceptor::ClientRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   if (ACE_OS::strcmp (ri->operation (), "ready") == 0)
@@ -536,26 +528,24 @@ Vault_Client_Request_Dynamic_Interceptor::receive_reply (
       CORBA_Any result_any = *(ri->result ());
       result_any >>= result;
     }
-
 }
 
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_other (
-               PortableInterceptor::ClientRequestInfo_ptr
-               TAO_ENV_ARG_DECL_NOT_USED
-               )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
 
 void
 Vault_Client_Request_Dynamic_Interceptor::receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr rinfo
-      TAO_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr rinfo
+    TAO_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   TAO_ENV_ARG_DEFN;
 
@@ -600,7 +590,8 @@ Vault_Server_Request_Dynamic_Interceptor::_remove_ref (void)
 }
 
 char *
-Vault_Server_Request_Dynamic_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+Vault_Server_Request_Dynamic_Interceptor::name (
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->myname_);
@@ -608,12 +599,12 @@ Vault_Server_Request_Dynamic_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED
 
 void
 Vault_Server_Request_Dynamic_Interceptor::receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
- if (ACE_OS::strcmp (ri->operation (), "authenticate") == 0)
+  if (ACE_OS::strcmp (ri->operation (), "authenticate") == 0)
     {
       Dynamic::ParameterList paramlist = *(ri->arguments ());
       const char *user;
@@ -632,18 +623,18 @@ Vault_Server_Request_Dynamic_Interceptor::receive_request (
 
 void
 Vault_Server_Request_Dynamic_Interceptor::receive_request_service_contexts(
-             PortableInterceptor::ServerRequestInfo_ptr
-             TAO_ENV_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
 
 void
 Vault_Server_Request_Dynamic_Interceptor::send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr ri
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr ri
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -664,8 +655,8 @@ Vault_Server_Request_Dynamic_Interceptor::send_reply (
 
 void
 Vault_Server_Request_Dynamic_Interceptor::send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -715,50 +706,48 @@ Vault_Client_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Vault_Client_Request_NOOP_Interceptor::send_poll (
-                PortableInterceptor::ClientRequestInfo_ptr
-                TAO_ENV_ARG_DECL_NOT_USED
-                )
-      ACE_THROW_SPEC ((CORBA::SystemException))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Do nothing
 }
 
 void
 Vault_Client_Request_NOOP_Interceptor::send_request (
-      PortableInterceptor::ClientRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
 
 }
 
 void
 Vault_Client_Request_NOOP_Interceptor::receive_other (
-               PortableInterceptor::ClientRequestInfo_ptr
-               TAO_ENV_ARG_DECL_NOT_USED
-               )
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
 
 void
 Vault_Client_Request_NOOP_Interceptor::receive_reply (
-      PortableInterceptor::ClientRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+    PortableInterceptor::ClientRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
 }
 
 void
 Vault_Client_Request_NOOP_Interceptor::receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr rinfo
-      TAO_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ClientRequestInfo_ptr rinfo
+    TAO_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   TAO_ENV_ARG_DEFN;
 
@@ -811,28 +800,27 @@ Vault_Server_Request_NOOP_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 Vault_Server_Request_NOOP_Interceptor::receive_request (
-      PortableInterceptor::ServerRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-
 }
 
 void
 Vault_Server_Request_NOOP_Interceptor::receive_request_service_contexts(
-             PortableInterceptor::ServerRequestInfo_ptr
-             TAO_ENV_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do nothing
 }
 
 void
 Vault_Server_Request_NOOP_Interceptor::send_reply (
-      PortableInterceptor::ServerRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
@@ -840,8 +828,8 @@ Vault_Server_Request_NOOP_Interceptor::send_reply (
 
 void
 Vault_Server_Request_NOOP_Interceptor::send_exception (
-      PortableInterceptor::ServerRequestInfo_ptr
-      TAO_ENV_ARG_DECL_NOT_USED)
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
@@ -849,10 +837,10 @@ Vault_Server_Request_NOOP_Interceptor::send_exception (
 
 void
 Vault_Server_Request_NOOP_Interceptor::send_other (
-             PortableInterceptor::ServerRequestInfo_ptr
-             TAO_ENV_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest))
+    PortableInterceptor::ServerRequestInfo_ptr
+    TAO_ENV_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableInterceptor::ForwardRequest))
 {
   // Do Nothing
 }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
index 8450bcbe062..4b16f78b58c 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
+++ b/TAO/tests/Portable_Interceptors/Benchmark/interceptors.h
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
 // $Id$
 
 #ifndef TAO_INTERCEPTORS_H
@@ -17,8 +19,8 @@
 #endif /* _MSC_VER */
 
 class Vault_Client_Request_Interceptor
-:  public PortableInterceptor::ClientRequestInterceptor//,
-   //  public CORBA::LocalObject
+  : public PortableInterceptor::ClientRequestInterceptor,
+    public CORBA::LocalObject
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -40,7 +42,7 @@ public:
 
   virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
                           TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -53,22 +55,21 @@ public:
 
   virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
                               TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableInterceptor::ForwardRequest));
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableInterceptor::ForwardRequest));
 
   virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
                                   TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-
     ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
+                     PortableInterceptor::ForwardRequest));
 
 private:
   const char *myname_;
 };
 
 class Vault_Server_Request_Interceptor
-: public PortableInterceptor::ServerRequestInterceptor//,
-//    public CORBA::LocalObject
+  : public PortableInterceptor::ServerRequestInterceptor,
+    public CORBA::LocalObject
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -117,8 +118,8 @@ private:
 };
 
 class Vault_Client_Request_Context_Interceptor
-:  public PortableInterceptor::ClientRequestInterceptor//,
-   //  public CORBA::LocalObject
+  : public PortableInterceptor::ClientRequestInterceptor,
+    public CORBA::LocalObject
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -166,7 +167,8 @@ private:
 };
 
 class Vault_Server_Request_Context_Interceptor
-  : public PortableInterceptor::ServerRequestInterceptor
+  : public PortableInterceptor::ServerRequestInterceptor,
+    public CORBA::LocalObject
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -216,8 +218,8 @@ private:
 
 
 class Vault_Client_Request_Dynamic_Interceptor
-:  public PortableInterceptor::ClientRequestInterceptor//,
-   //  public CORBA::LocalObject
+  : public PortableInterceptor::ClientRequestInterceptor,
+    public CORBA::LocalObject
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -265,8 +267,8 @@ private:
 };
 
 class Vault_Server_Request_Dynamic_Interceptor
-  : public PortableInterceptor::ServerRequestInterceptor//,
-//    public CORBA::LocalObject
+  : public PortableInterceptor::ServerRequestInterceptor,
+    public CORBA::LocalObject
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -316,7 +318,8 @@ private:
 
 
 class Vault_Client_Request_NOOP_Interceptor
-  :  public PortableInterceptor::ClientRequestInterceptor
+  : public PortableInterceptor::ClientRequestInterceptor,
+    public CORBA::LocalObject
 {
   // = Client-side Vault interceptor.  For checking interceptor visually only.
 public:
@@ -364,8 +367,8 @@ private:
 };
 
 class Vault_Server_Request_NOOP_Interceptor
-: public PortableInterceptor::ServerRequestInterceptor//,
-//    public CORBA::LocalObject
+  : public PortableInterceptor::ServerRequestInterceptor,
+    public CORBA::LocalObject
 {
   // = Server-side Vault interceptor.  For checking interceptor visually only.
 public:
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test.idl b/TAO/tests/Portable_Interceptors/Benchmark/test.idl
index 77e3c3114aa..a9ab2484085 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/test.idl
+++ b/TAO/tests/Portable_Interceptors/Benchmark/test.idl
@@ -1,9 +1,11 @@
+// -*- IDL -*-
+//
 // $Id$
 
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/tests/Interceptors
+//    TAO/tests/Portable_Interceptors
 //
 // = FILENAME
 //    test.idl
@@ -17,8 +19,7 @@
 
 module Test_Interceptors
 {
-  exception Invalid
-    {};
+  exception Invalid {};
 
   interface Secure_Vault
   {
@@ -34,19 +35,17 @@ module Test_Interceptors
       long check_num;
       long amount;
     };
-       
+
     short ready ();
     // No args/exceptions operation.
 
-    void authenticate (in string user)
-      raises (Invalid);
+    void authenticate (in string user);
     // throws a user exception.
 
     long update_records (in long id, in Record val);
     // Normal operation with a return val.
 
-   oneway void shutdown ();
+    oneway void shutdown ();
     // shutdown the ORB
-
   };
 };