Mon Jan 29 19:11:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>

4 files changed, 24 insertions, 41 deletions

diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp
index 8d587c11162..4c8fe0aec64 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.cpp
+++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp
@@ -58,7 +58,7 @@ TAO_PI_Server_Loader::init (int,
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                     );
     }
-  catch ( ::CORBA::Exception& ex)
+  catch (const ::CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Caught exception:");
       return -1;
diff --git a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
index 00c30c716b2..5c5c44e4fca 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -74,7 +74,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
         {
           info->register_policy_factory (*i, policy_factory.in ());
         }
-      catch ( ::CORBA::BAD_INV_ORDER& ex)
+      catch (const ::CORBA::BAD_INV_ORDER& ex)
         {
           if (ex.minor () == (CORBA::OMGVMCID | 16))
             {
@@ -87,7 +87,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
             }
           throw;
         }
-      catch ( ::CORBA::Exception&)
+      catch (const ::CORBA::Exception&)
         {
           // Rethrow any other exceptions...
           throw;
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 057d604fca8..c63c768c286 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -82,7 +82,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
           ++server_request.interceptor_count ();
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -152,7 +152,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
             }
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -219,7 +219,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
           ++server_request.interceptor_count ();
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -290,7 +290,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
           // an intermediate interception point.
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -408,7 +408,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
             }
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -439,8 +439,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
                             nargs,
                             servant_upcall,
                             exceptions,
-                            nexceptions
-                           );
+                            nexceptions);
 
       PortableInterceptor::ReplyStatus status =
         server_request.reply_status ();
@@ -498,13 +497,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
 
           if (registered.details_.should_be_processed (is_remote_request))
             {
-              registered.interceptor_->
-                send_other (&request_info
-                           );
+              registered.interceptor_->send_other (&request_info);
             }
         }
     }
-  catch ( ::PortableInterceptor::ForwardRequest& exc)
+  catch (const ::PortableInterceptor::ForwardRequest& exc)
     {
       server_request.forward_location (exc.forward.in ());
       server_request.reply_status (PortableInterceptor::LOCATION_FORWARD);
@@ -529,17 +526,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-  const CORBA::PolicyList& policies
-  )
+  const CORBA::PolicyList& policies)
 {
-  this->interceptor_list_.add_interceptor (interceptor,
-                                           policies
-                                          );
+  this->interceptor_list_.add_interceptor (interceptor, policies);
 }
 
 void
-TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (
-  void)
+TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (void)
 {
   this->interceptor_list_.destroy_interceptors ();
 }
@@ -564,8 +557,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current (
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::execute_command (
   TAO_ServerRequest & server_request,
-  TAO::Upcall_Command & command
-  )
+  TAO::Upcall_Command & command)
 {
   TAO::PICurrent_Guard const pi_guard (server_request,
                                        true  /* Copy TSC to RSC */);
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index d9d403925c7..47f296a1504 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -92,8 +92,7 @@ namespace TAO
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
         CORBA::ULong nexceptions,
-        CORBA::OctetSeq_out oc
-       );
+        CORBA::OctetSeq_out oc);
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
 
     /// This method implements the "intermediate" server side
@@ -109,8 +108,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
 
     /// This method an "intermediate" server side interception point.
     void receive_request (
@@ -119,8 +117,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -130,8 +127,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -141,8 +137,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
 
     /// This method implements one of the "ending" server side
     /// interception points.
@@ -152,8 +147,7 @@ namespace TAO
         size_t nargs,
         void * servant_upcall,
         CORBA::TypeCode_ptr const * exceptions,
-        CORBA::ULong nexceptions
-       );
+        CORBA::ULong nexceptions);
     //@}
 
     /// Register an interceptor.
@@ -163,20 +157,17 @@ namespace TAO
 
     virtual void add_interceptor (
       PortableInterceptor::ServerRequestInterceptor_ptr interceptor,
-      const CORBA::PolicyList& policies
-     );
+      const CORBA::PolicyList& policies);
 
     virtual void destroy_interceptors (void);
 
     virtual TAO::PICurrent_Impl *allocate_pi_current (void);
 
-    virtual void deallocate_pi_current (
-        TAO::PICurrent_Impl *picurrent);
+    virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent);
 
     virtual void execute_command (
         TAO_ServerRequest &server_request,
-        TAO::Upcall_Command &command
-       );
+        TAO::Upcall_Command &command);
 
   private: