Merge pull request #637 from jwillemsen/master

Fixed typo and removed some empty lines

5 files changed, 1 insertions, 11 deletions

diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 708891e7674..fc7a4980394 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -141,7 +141,6 @@ TAO_ClientRequestInfo::received_exception (void)
   // The spec says that if it is a user exception which can't be
   // inserted then the UNKNOWN exception needs to be thrown with minor
   // code 1.
-
   CORBA::Any * temp = 0;
 
   ACE_NEW_THROW_EX (temp,
@@ -367,7 +366,7 @@ TAO_ClientRequestInfo::request_id (void)
 
   // @@ The following request ID generator prevents the
   //    PortableInterceptor::ClientRequestInterceptor::send_request()
-  //    interception point from occuring before the call to connect,
+  //    interception point from occurring before the call to connect,
   //    thus preventing us from adding an optimization that itself
   //    prevents a connection from being unnecessarily performed.
   //    Thus, the ClientRequestInfo object is forced to have its own
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
index e81c2d3ebaa..79836dbacda 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
@@ -22,7 +22,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_ERROR, "Got number %d\n", n));
 
       server->shutdown ();
-
     }
   catch (const ::CORBA::Exception &ex)
     {
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
index db2fe365522..540d1e6e0c8 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
@@ -162,7 +162,6 @@ public:
     slot_id = info->allocate_slot_id ();
     ACE_DEBUG ((LM_DEBUG, "Allocated slot with id %d.\n", slot_id));
 
-
     ServerRequestInterceptor_var interceptor (new ReplicaController ());
     info->add_server_request_interceptor (interceptor.in ());
   }
@@ -199,7 +198,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       poa_manager->activate ();
 
-
       // Dump the ior.
       //
       FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
index a7660ec5c1a..d27ae377027 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp
@@ -89,7 +89,6 @@ void
 Echo_Server_Request_Interceptor::send_reply (
     PortableInterceptor::ServerRequestInfo_ptr ri)
 {
-
   CORBA::String_var operation = ri->operation ();
 
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
index b3bc101f5c0..3937af13fdd 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h
@@ -8,7 +8,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_INTERCEPTOR_TEST_I_H
 #define TAO_INTERCEPTOR_TEST_I_H
 
@@ -21,9 +20,7 @@
  */
 class Visual_i : public POA_Test_Interceptors::Visual
 {
-
 public:
-
   Visual_i (CORBA::ORB_ptr orb);
 
   void normal (CORBA::Long arg);
@@ -37,10 +34,8 @@ public:
   void shutdown (void);
 
 private:
-
   /// The ORB pseudo-reference (for shutdown).
   CORBA::ORB_var orb_;
-
 };
 
 #endif /* TAO_INTERCEPTOR_TEST_I_H */