Fixed Redundant blank line at the end of a code block should be deleted

116 files changed, 0 insertions, 160 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 768ec577f22..8cf78960834 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -70,7 +70,6 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
@@ -230,7 +229,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       // Hack for now....
       ACE_OS::sleep (1);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index 2f46f68479e..03e265cdfe4 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -256,7 +256,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
     }
   catch (const CORBA::Exception& ex)
@@ -305,7 +304,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                            "client::init failed\n"), -1);
 
       SENDER::instance ()->pace_data ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 87785bb6e65..531173b6d4f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -123,7 +123,6 @@ Receiver_Callback::handle_destroy (void)
           ex._tao_print_exception (
             "Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
         }
 
     }
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 4ab1e54dc56..da72c56164b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -382,7 +382,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
 
          // File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 459ccf9fa56..fbe163dff5c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -23,7 +23,6 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
                     "In the signal handler\n"));
 
       DISTRIBUTER::instance ()->done (1);
-
     }
   return 0;
 }
@@ -119,12 +118,10 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
 
           ///Destroy old stream with the same flowname.
           connection_manager.destroy (flowname);
-
         }
 
       /// Store the related streamctrl.
       connection_manager.add_streamctrl (flowname.c_str (), this);
-
     }
   return true;
 }
@@ -390,7 +387,6 @@ Distributer::shut_down (void)
                                                                      sender_mmdevice.in ());
 
     //  DISTRIBUTER::instance ()->connection_manager ().destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -438,14 +434,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
           if (wp)
           {
             orb->perform_work ();
-
           }
         }
 
       DISTRIBUTER::instance ()->shut_down ();
 
 //      orb->shutdown(true);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index b09446f5468..b6a113c5e18 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -68,7 +68,6 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
       /// Store the related streamctrl.
       connection_manager->add_streamctrl (flowname.c_str (),
                                          this);
-
     }
   return 1;
 }
@@ -262,8 +261,6 @@ Receiver::shut_down (void)
       this->connection_manager_.unbind_receiver (this->sender_name_,
                                                  this->receiver_name_,
                                                  mmdevice_obj.in ());
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 4b9f16c1999..e2958400895 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -31,7 +31,6 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*)
                     "In the signal handler\n"));
 
       g_shutdown = 1;
-
     }
   return 0;
 }
@@ -157,7 +156,6 @@ Sender::shut_down (void)
 
       SENDER::instance ()->connection_manager ().unbind_sender (this->sender_name_,
                                                                 mmdevice.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -326,7 +324,6 @@ Sender::pace_data (void)
               this->shut_down ();
 
               break;
-
             }
 
           this->mb_.wr_ptr (n);
@@ -365,7 +362,6 @@ Sender::pace_data (void)
                   /// Run the orb for the wait time so the sender can
                   /// continue other orb requests.
                   TAO_AV_CORE::instance ()->orb ()->run (wait_time);
-
                 }
             }
 
@@ -396,7 +392,6 @@ Sender::pace_data (void)
 
           /// Reset the message block.
           this->mb_.reset ();
-
         } /// end while
 
     }
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 5038555626a..0bd805403cb 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -313,7 +313,6 @@ Client::run (void)
       this->orb_->run (tv);
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -353,7 +352,6 @@ ACE_TMAIN (int argc,
 
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1);
-
     }
   catch (const CORBA::Exception& ex)
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 808d78b1227..74090d97812 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -136,8 +136,6 @@ Server::init (int argc,
       // Register the video control object with the naming server.
       this->my_naming_client_->rebind (server_sep_b_name,
                                        sep_b_.in ());
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 793325b735d..183dca390a0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -148,7 +148,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
      // flow_spec.length (0);
      // stream_control->stop (flow_spec);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index b538a2695fa..72d5d0e4b7f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -172,7 +172,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "done %d\n", gsf));
 
       recv_latency.dump_results (ACE_TEXT("Receive"), gsf);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index e6e8cb44664..c636d9d9977 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -190,7 +190,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       recv_latency.dump_results (ACE_TEXT("Receive"), gsf);
 
       send_latency.dump_results (ACE_TEXT("Send"), gsf);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index c14b1843eca..fa2b9a8bb5c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -140,7 +140,6 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index b72278736b9..f5f5ac9169a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -329,7 +329,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
 
       // File reading is complete, destroy the stream.
@@ -384,7 +383,6 @@ ACE_TMAIN (int argc,
 
       // Start sending data.
       result = SENDER::instance ()->pace_data ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 9af75d01c61..c07f8cc9356 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -125,7 +125,6 @@ Client::parse_args (int argc, ACE_TCHAR *argv[])
         default:
           ACE_DEBUG ((LM_DEBUG,"Unknown option\n"));
           return -1;
-
         }
     }
   return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 15f68fb1acb..6ee1789465a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -66,7 +66,6 @@ Receiver_Callback::flowname (const char* flow_name)
                 "%C File Opened Successfully\n",
                 this->flowname_.c_str ()));
 
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 4b74dfdff1c..887f61024ab 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -334,7 +334,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
 
       ACE_OS::sleep (1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index e05923885f4..2062fc50c38 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -375,7 +375,6 @@ Client::pace_data (void)
 
           // Reset the mb.
           this->mb.reset ();
-
         } // end while
 
       // Since the file is read stop the stream.
@@ -384,7 +383,6 @@ Client::pace_data (void)
 
       // Shut the orb down.
       TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index ec3f5548c13..7e567f8abf3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -305,7 +305,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
 
       // File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index c5d8103778f..db2f5ae960b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -70,7 +70,6 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 740430dec90..53cb840518c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -280,7 +280,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
 
       // If a stream was setup, destroy it.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index d1ee8185118..403c5ac0893 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -131,7 +131,6 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
@@ -279,8 +278,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_OS::sleep (1);
 
       orb->destroy ();
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index 48b4b51d641..f1ad51fba21 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -396,7 +396,6 @@ Sender::pace_data (void)
 
           // Reset the message block.
           this->mb_.reset ();
-
         } // end while
 
       // File reading is complete, destroy the stream.
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index 4ca00b3b1a0..222c21eaaf0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -71,7 +71,6 @@ Receiver_Callback::handle_destroy (void)
     {
       ex._tao_print_exception ("Receiver_Callback::handle_destroy Failed\n");
       return -1;
-
     }
 
   return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index c2eabbc1e9f..0936a4361c2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -464,7 +464,6 @@ Sender::pace_data (void)
 
       // Shut the orb down.
       TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index 7b1749f6094..f61cada2e74 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -107,7 +107,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_manager->activate ();
 
       orb->run ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
index a6b5c27169a..e98c6b869be 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/client.cpp
@@ -85,7 +85,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
index b602f5839d3..dcb138f4d1d 100644
--- a/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3215_Regression/server.cpp
@@ -151,7 +151,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           CORBA::Policy_ptr policy = policies[i];
           policy->destroy ();
-
         }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
index 281c701abdd..4fdbd6572c2 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/server.cpp
@@ -149,7 +149,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         {
           CORBA::Policy_ptr policy = policies[i];
           policy->destroy ();
-
         }
 
 
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 30a1ba98a50..1f02ddec574 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -422,7 +422,6 @@ CC_Client::init (int argc, ACE_TCHAR **argv)
 
       ACE_DEBUG ((LM_DEBUG,
                   "Factory received OK\n"));
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index 01abae4bab0..02c06d83899 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -244,7 +244,6 @@ int CC_UnLock_Cmd::execute(void)
       CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
       ccls->unlock (mode_);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -347,7 +346,6 @@ int CC_ChangeMode_Cmd::execute(void)
       CosConcurrencyControl::LockSet_var ccls = GetLockSet(name_);
 
       ccls->change_mode (held_mode_, new_mode_);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -540,7 +538,6 @@ CC_Lookup_Cmd::execute(void)
             CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
           cc_lockset_ = ccls;
-
         }
       catch (const CORBA::Exception& ex)
         {
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
index ff947dd64eb..5073a4f2aab 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp
@@ -209,7 +209,6 @@ Test_Use_Already_Created_LockSet::run (int /* times_to_run */)
         CosConcurrencyControl::LockSet::_narrow (ccls_obj.in ());
 
       ccls->lock (CosConcurrencyControl::read);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -312,7 +311,6 @@ Test_Release_Not_Held_Lock::run (int /* times_to_run */)
       ACE_DEBUG ((LM_DEBUG,
                   "attemptet to release %s lock\n",
                   get_lock_mode_name (mode_)));
-
     }
   catch (const CosConcurrencyControl::LockNotHeld& userex)
     {
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 91776012695..7be8a6b6ed0 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -38,7 +38,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa->destroy (true, true);
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index d8d9bc52d97..9ad047ca96e 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -38,7 +38,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa->destroy (true, true);
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index f98e7edcaee..37fa4b842c3 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -171,7 +171,6 @@ ECM_Driver::run (int argc, ACE_TCHAR* argv[])
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
 
       ec_impl.shutdown ();
-
     }
   catch (const CORBA::SystemException& sys_ex)
     {
@@ -1012,7 +1011,6 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
     qos.get_SupplierQOS ();
   this->receiver_->connect (qos_copy);
 
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 731a92e2cca..4ae2fb8e539 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -352,7 +352,6 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[])
               scheduler = scheduler_impl->_this ();
             }
           break;
-
         }
 
       // We use this buffer to generate the names of the local
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index 5e21504ad0a..36399a21d1e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -39,7 +39,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa->destroy (true, true);
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index ffc8063c080..727ab33817c 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -40,7 +40,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa->destroy (true, true);
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index f39d36996f4..dc00e890387 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -273,7 +273,6 @@ EC_Observer::execute_test (void)
         rmt_ec->append_observer (obs.in ());
 
       this->gwys_[i].observer_handle (h);
-
     }
 
   if (this->allocate_tasks () == -1)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
index b57aa1d2c18..8b530e70ecc 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventConsumerMain.cpp
@@ -99,7 +99,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->destroy();
 
     return 0;
-
   }
   catch (const CORBA::Exception& exc)
   {
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
index f18548a703e..a2e74436ef0 100644
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
@@ -233,7 +233,6 @@ EC_Supplier_Task::svc (void)
               // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
 
               this->supplier_->send_event (event);
-
             }
           catch (const CORBA::SystemException& sys_ex)
             {
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 2f86d0c753e..bfee692bb08 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -295,7 +295,6 @@ int FTClientMain::pass (
           }
           echo = 0;
           break;
-
         }
         case '>':
         {
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 450ef8bd016..60150e30990 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -225,7 +225,6 @@ int FTAPP::FT_Creator::run (void)
     }
 
     iogr_seq_ += 1;
-
   }
 
   typeCount = this->unregister_roles_.size();
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 131f9e30512..91241cb64c4 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -103,8 +103,6 @@ namespace FTAPP
      * prefix for names
      */
     ACE_CString prefix_;
-
-
   };
 } // namespace TAO
 
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index be9bed2e5fd..105cfa6298c 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -296,7 +296,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group (
 
       //@@ this is a bit of a hack
       creation_id >>= group_id;
-
     }
 
     const PortableGroup::Location * first_location = 0;
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
index 50ae2d24637..e1d7fa6888f 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp
@@ -33,7 +33,6 @@ Basic::remove_member (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t) - Removed Member at Location <%s>\n"),
                   this->location_.in ()));
-
     }
   catch (const PortableGroup::ObjectNotFound& ex)
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index 4276d42ff26..06e69c84b12 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -135,7 +135,6 @@ LB_server::start_orb_and_poa (void)
                            ACE_TEXT (" (%P|%t) Unable to get Naming Manager ")
                            ACE_TEXT ("Reference.\n")),
                           -1);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 41fa104ce9d..dffc347a8ba 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -1522,7 +1522,6 @@ do_persistence_objectgroup_test (
             out << num_locations << std::endl;
             out << loc[0].id.in () << std::endl;
             out << member_str.in() << std::endl;
-
           }
           catch (const PortableGroup::ObjectGroupNotFound&)
             {
@@ -1740,7 +1739,6 @@ do_equivalence_name_test (
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("INFO: ns2ref profile count: %d\n"),
                 ns2_count));
-
   }
   catch (const CORBA::Exception& ex)
   {
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
index 5e509d5c117..640888ebb9e 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
@@ -124,7 +124,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (lb_server.destroy () == -1)
         return 1;
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
index 4fad32a961d..1270f07d131 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp
@@ -33,7 +33,6 @@ Basic::remove_member (void)
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%C>\n",
                       this->location_.in ()));
-
     }
   catch (const PortableGroup::ObjectNotFound& ex)
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
index b51bfac2a0d..a05c3ae676d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -133,7 +133,6 @@ LB_server::start_orb_and_poa (void)
                            ACE_TEXT (" (%P|%t) Unable to get Naming ")
                            ACE_TEXT ("Manager Reference\n")),
                           -1);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
index 717df80dbae..42bb126e69d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
@@ -80,7 +80,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           // Narrow it to a Basic object
           basic =
             Test::Basic::_narrow (tmp.in ());
-
         }
         catch (const CORBA::Exception& ex)
           {
@@ -104,7 +103,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                       ACE_TEXT ("(%P|%t) - Client request handled ")
                       ACE_TEXT ("by object at <%C>\n"),
                       the_string.in ()));
-
         }
         catch (const CORBA::Exception& ex)
           {
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
index 36cb74661c1..2e3d9e03177 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/server.cpp
@@ -105,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (lb_server.destroy () == -1)
         return 1;
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
index 4d2423caf54..036456550b7 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -177,7 +177,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                ns2ref),
                               -1);
     root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ());
-
   }
   catch (const CORBA::Exception& ex)
   {
@@ -665,8 +664,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Unbound %i objects in %.2f secs\n"),
                 test_runs, secs));
-
-
   }
   catch (const CORBA::Exception& ex)
   {
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
index 4fad32a961d..1270f07d131 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp
@@ -33,7 +33,6 @@ Basic::remove_member (void)
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%C>\n",
                       this->location_.in ()));
-
     }
   catch (const PortableGroup::ObjectNotFound& ex)
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
index 17231082463..ca0b3a3b68e 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
@@ -131,7 +131,6 @@ LB_server::start_orb_and_poa (void)
                            ACE_TEXT (" (%P|%t) Unable to get Naming ")
                            ACE_TEXT ("Manager Reference\n")),
                           -1);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
index 56e05df6664..b589a527aaf 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp
@@ -150,7 +150,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           // Narrow it to a Basic object
           basic =
             Test::Basic::_narrow (tmp.in ());
-
         }
         catch (CORBA::Exception& ex)
           {
@@ -174,7 +173,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                       ACE_TEXT ("(%P|%t) - Client request handled ")
                       ACE_TEXT ("by object at <%C>\n"),
                       the_string.in ()));
-
         }
         catch (CORBA::Exception& ex)
           {
diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp
index 36cb74661c1..2e3d9e03177 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/server.cpp
@@ -105,7 +105,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (lb_server.destroy () == -1)
         return 1;
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
index 0e6b845a470..b57c464b174 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -81,8 +81,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           ACE_DEBUG ((LM_INFO,
                       "CLIENT: Number %d .\n",
                       number));
-
-
         }
 
       if (number < 250)
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index 4e66d38fddf..80d77f6fbed 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -81,7 +81,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_manager->activate ();
 
       orb->run ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 27a190e1702..24aa27c21e4 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -51,7 +51,6 @@ get_event_channel(int argc, ACE_TCHAR** argv)
                    ACE_TEXT("\n"),
                       argv[0]));
         return 0;
-
       }
     }
 
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index fe3cf38c26d..59accd8e387 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -129,7 +129,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       orb->run ();
 
       root_poa->destroy (true, true);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index d12401d49a9..487d61009a4 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -10,7 +10,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
       if (init_result != 0)
         return 1;
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
index f6d64472876..82931fecd4a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp
@@ -173,7 +173,6 @@ Server_i::run (void)
       }
 
       this->orb_->run ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
index 3d997aea380..3fa4c48d90d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp
@@ -167,7 +167,6 @@ public:
       client_interceptor = interceptor;
 
     info->add_client_request_interceptor (client_interceptor.in ());
-
   }
 };
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
index 5e4a71ad7b6..af5c3fe8a64 100644
--- a/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/double_start/server.cpp
@@ -171,7 +171,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->destroy();
 
     //    ACE_OS::unlink (pid_file.c_str ());
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception (ACE_TEXT ("Server main()"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
index 415978bcc12..d460ac4f087 100644
--- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp
@@ -169,7 +169,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->run();
     root_poa->destroy(1,1);
     orb->destroy();
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception ("Server main()");
diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
index 0f1ea1a0118..68068af2900 100644
--- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp
@@ -149,7 +149,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->run();
     root_poa->destroy(1,1);
     orb->destroy();
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception ("Server main()");
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
index d65dd22c22e..ad7d8f3511f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client.cpp
@@ -77,7 +77,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 n));
 
     return n != 1;
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception ("client:");
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
index 2d05c7b556d..0833f106602 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/client_ds.cpp
@@ -61,7 +61,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 n));
 
     return n != 1;
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception ("client:");
diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
index fea63bc3cae..954d2d8c587 100644
--- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp
@@ -161,7 +161,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->run();
     root_poa->destroy(1,1);
     orb->destroy();
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception ("Server main()");
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
index 9bf0ef6eb77..c0c61e5e462 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server.cpp
@@ -144,7 +144,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     root_poa->destroy(1,1);
     orb->destroy();
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception (ACE_TEXT("Server main()"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
index d94bbe5cf91..5ed5aae5ca3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale_clients/client.cpp
@@ -147,7 +147,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->destroy ();
 
     return 0;
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception ("Client:");
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
index b3a046998c2..9161b4765f4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/client.cpp
@@ -84,7 +84,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
             }
         }
       return 0;
-
     }
   catch(const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
index 2a6ad20a2de..909e7e6d129 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_interact_on_startup/server.cpp
@@ -196,7 +196,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("(%P|%t|%T) Server %d ending serving of %C\n"),
                 server_num, poa_name.c_str ()));
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception (ACE_TEXT ("Server main()"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
index 1aca6cf2a07..6577003664a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/client.cpp
@@ -67,7 +67,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     orb->destroy ();
 
     return 0;
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception ("client:");
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
index 1ac34448543..a0508df2a31 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/server.cpp
@@ -147,7 +147,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     root_poa->destroy(1,1);
     orb->destroy();
-
   }
   catch(const CORBA::Exception& ex) {
     ex._tao_print_exception ("Server main()");
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
index ec6d7aa3de6..ea50ccb7ab0 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp
@@ -31,7 +31,6 @@ Basic::remove_member (void)
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_.in ()));
-
     }
   catch (const PortableGroup::ObjectNotFound& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index 78b94429c09..56445e5a102 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -125,7 +125,6 @@ LB_server::start_orb_and_poa (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get Load Manager Reference\n"),
                           1);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index 60136341346..aaf95413fbf 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -93,7 +93,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (lb_server.destroy () == -1)
         return 1;
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
index d83119bbc0f..c0e4eea6316 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp
@@ -58,7 +58,6 @@ Basic::remove_member (void)
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Removed Member at Location <%s>\n",
                       this->location_.in ()));
-
     }
   catch (const PortableGroup::ObjectNotFound& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
index 88dac29fa65..1734d796f93 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp
@@ -107,7 +107,6 @@ LB_server::start_orb_and_poa (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get Load Manager Reference\n"),
                           1);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
index 74fe151c85a..151c37b379e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/server.cpp
@@ -155,7 +155,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (lb_server.destroy () == -1)
         return 1;
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index c1fe0ef575c..56cc9b4a95f 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -135,7 +135,6 @@ LB_server::start_orb_and_poa (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get Load Manager Reference\n"),
                           1);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -229,7 +228,6 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
         this->orb_->object_to_string (this->object_group_.in ());
 
       this->write_ior_to_file (ior.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index db548b84149..7fccc189e41 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -61,7 +61,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                   the_string.in ()));
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
index 8ec4ef7c08c..17c16dba3cd 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp
@@ -39,7 +39,6 @@ Basic::remove_member (void)
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
-
     }
   catch (const PortableGroup::ObjectNotFound& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
index 6433cb05cc7..59db1435e5e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp
@@ -90,7 +90,6 @@ LB_server::start_orb_and_poa (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to get Load Manager Reference\n"),
                           1);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -127,7 +126,6 @@ LB_server::create_basic_object_group (void)
 
       CORBA::String_var ior =
         this->orb_->object_to_string (this->basic_object_group_.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -165,7 +163,6 @@ LB_server::create_simple_object_group (void)
 
       CORBA::String_var ior =
         this->orb_->object_to_string (this->simple_object_group_.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
index 3f97b2c8979..8de7c1e58d5 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp
@@ -39,7 +39,6 @@ Simple::remove_member (void)
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Removed Member at Location <%s>\n",
                       this->location_));
-
     }
   catch (const PortableGroup::ObjectNotFound& ex)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 1fef2a2c27f..86835aaa178 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -113,7 +113,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       if (lb_server.destroy () == -1)
         return 1;
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 466a680e1df..de1ef2e5ce5 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -299,7 +299,6 @@ int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
         CORBA::String_var t(str.c_str ());
         record[0] <<= t.in ();
         basicLog_->write_records(record);
-
       }
   }
 
@@ -323,7 +322,6 @@ BasicLog_Test::test_adminState()
       this->write_records(0);
 
       ACE_ERROR_RETURN((LM_ERROR,"Setting administrative state to lock failed.  DsLogAdmin::LogLocked not thrown.\n"),-1);
-
     }
   catch (const DsLogAdmin::LogLocked&)
     {
@@ -342,7 +340,6 @@ BasicLog_Test::test_adminState()
       this->write_records(0);
       ACE_DEBUG ((LM_DEBUG,"Setting administrative state to succeeded.  DsLogAdmin::LogLocked not thrown.\n"));
       ACE_RETURN(0);
-
     }
   catch (const DsLogAdmin::LogLocked&)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index fd444d02ea0..a4471ffefbb 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -130,7 +130,6 @@ Events::parse_args (int argc,
         {
           this->use_default_admin_ = 1;
           arg_shifter.consume_arg ();
-
         }
       else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-events"))))
         {
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 753ac74d846..7eded75b6ef 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -86,7 +86,6 @@ IdAssignment::init (int argc,
       ACE_ERROR ((LM_ERROR,
                   " (%P|%t) Unable to resolve naming service !\n"));
       return;
-
     }
   CosNaming::NamingContext_var rootNC =
     CosNaming::NamingContext::_narrow (rootObj.in ());
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
index e1b15e1fc3c..21bd1c6aae9 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/consumer.cpp
@@ -24,7 +24,6 @@ namespace CosNotifyCommImpl{
       std::cout << "event.header.fixed_header.event_type.type_name = "
         << event.header.fixed_header.event_type.type_name
         << std::endl;
-
     };
 
     void disconnect_structured_push_consumer()
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
index 9ae43cd8654..1e2ee3809d3 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/filter.cpp
@@ -227,7 +227,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     match_structure_test (filter, event, expected_result);
 
     orb->shutdown();
-
   }
   catch(...)
   {
diff --git a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
index b9e1fd75cab..172a6306ad4 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_1884_Regression/supplier.cpp
@@ -9,7 +9,6 @@ namespace CosNotifyCommImpl{
     void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
-
   };
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
index f5939a0a146..22e031184df 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Consumer.cpp
@@ -162,7 +162,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                 status = consumer_1->messages_received() == 1 ? 0 : 1;
 
               ACE_DEBUG((LM_DEBUG, "Test status is %s.\n", status == 1 ? "fail" : "pass"));
-
             }
         }
     }
diff --git a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
index 78440bec547..ad34e9cfa75 100644
--- a/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Bug_3688_Regression/supplier.cpp
@@ -11,7 +11,6 @@ namespace CosNotifyCommImpl{
     void subscription_change( const CosNotification::EventTypeSeq&,
       const CosNotification::EventTypeSeq&)
     {};
-
   };
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 56879cece67..9672f19024d 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -269,7 +269,6 @@ TAO_Notify_Tests_RT_POA_Command::create (RTCORBA::RTORB_ptr rt_orb, PortableServ
       // Create a thread-pool policy.
       lanes_policy =
         rt_orb->create_threadpool_policy (threadpool_id);
-
     }
   else if (thread_pool_static_threads_ > 0)
     {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
index 102a6760b16..1cb8deed507 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -163,7 +163,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     sig->done ();
 
     return 0;
-
   }
   catch (const CORBA::Exception& e)
   {
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index d687432802d..b8c8f6c45bb 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -291,7 +291,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR *av[])
       ////////////////////////////////
       // TODO make this not hardcoded
       ACE_OS::rename ("abc.xml", "loadtest.xml");
-
     } // end of pass 1
 
     if (pass2)
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 5cb0902ea3a..32d9d5675a8 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -151,7 +151,6 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void)
       ACE_DEBUG ((LM_ERROR, "Running ORB, timeout in %d sec\n", this->run_period_.sec ()));
 
       this->orb_->run ();
-
     }
   catch (const CORBA::Exception&)
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
index 42a2d0a676d..1f5f98fb996 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -95,7 +95,6 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
       qos.length (1);
       qos[0].name = CORBA::string_dup (NotifyExt::ThreadPool);
       qos[0].value <<= tp_params;
-
     } /* ThreadPool */
   else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Lanes")) == 0) // -Lanes lane_count -Lane prio static_thr dy_thr
     {
@@ -149,6 +148,5 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, A
       qos.length (1);
       qos[0].name = CORBA::string_dup (NotifyExt::ThreadPoolLanes);
       qos[0].value <<= tpl_params;
-
     } /* ThreadPoolLane */
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index d3971798566..fabecb84dc7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
@@ -83,7 +83,6 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
          }
 
          consumer->init_state (arg_shifter);
-
         } /* -Create */
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Subscription")) == 0) // -Subscription admin_name +added_type1 +-added_type2 ... -added_type3 -added_type4..
         {
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 53fa04b748d..d1aa014c192 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -562,7 +562,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       events.dump_results();
 
       ACE_DEBUG ((LM_DEBUG, "ending main...\n"));
-
     }
   catch (const CORBA::Exception& se)
     {
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 6ff51a9ec3e..f583e10c785 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -164,7 +164,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                ns2ref),
                               -1);
     root_context_2 = CosNaming::NamingContext::_narrow (ns2obj.in ());
-
   }
   catch (const CORBA::Exception& ex)
   {
@@ -295,7 +294,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                          -1);
     result_object->destroy();
     root_context_1->unbind (deep);
-
   }
   catch (const CORBA::Exception& ex)
   {
@@ -435,8 +433,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                       ACE_TEXT ("Problems with resolving deep context from ")
                       ACE_TEXT ("redundant server - nil object ref.\n")),
                       -1);
-
-
   }
   catch (const CORBA::Exception& ex)
   {
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 78bbc88a2ee..f720fdbabb9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -140,7 +140,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
           ACE_ASSERT (priority == configs [j].thread_priority);
           ACE_ASSERT (dispatching_type == configs [j].dispatching_type);
-
         }
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
index 3e18c075205..e4039ce6ef1 100644
--- a/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
+++ b/TAO/orbsvcs/tests/Security/InsecureReferences/test.cpp
@@ -99,7 +99,6 @@ gen_objref (int argc, ACE_TCHAR *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Panic: nil RootPOA\n"),
                           1);
-
     }
   catch (const CORBA::Exception &ex)
     {
@@ -165,5 +164,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     return gen_objref(argc, argv);
   return parse_objref(argc, argv);
 
-
 }
diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
index 27649c77a50..64c5acf73df 100644
--- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp
@@ -23,7 +23,6 @@ Client_Task::svc (void)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("(%P|%t) Client_Task::svc exception!!!\n");
-
     }
 
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) Client task finished\n"));
diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
index 2f05d6995eb..f43e1449881 100644
--- a/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Null_Cipher/client.cpp
@@ -59,7 +59,6 @@ null_cipher_test (CORBA::ORB_ptr orb,
       ACE_DEBUG ((LM_INFO,
                   "(%P|%t) Received CORBA::NO_PERMISSION from "
                   "server\n"));
-
     }
 }
 
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index c07ac6145d3..a41ad93f439 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -368,7 +368,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 
       name_service_ior_ =
         orb_->object_to_string (context.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index ddde0038875..b0929b688a6 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -384,7 +384,6 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 
       name_service_ior_ =
         orb_->object_to_string (context.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index da30b07966e..0fc088ab8d4 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -34,7 +34,6 @@ Client_i::test_for_secure_universal_time (void)
     {
       CosTime::UTO_var UTO_server =
            this->clerk_->secure_universal_time ();
-
     }
   catch (const CORBA::SystemException& sysex)
     {
@@ -99,7 +98,6 @@ Client_i::test_for_new_universal_time (void)
       ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 0);
       ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 9999);
       ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -137,7 +135,6 @@ Client_i::test_for_uto_from_utc (void)
       ACE_ASSERT ((UTO_server->utc_time ()).inacclo == 50);
       ACE_ASSERT ((UTO_server->utc_time ()).inacchi == 50);
       ACE_ASSERT ((UTO_server->utc_time ()).tdf == 99);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -163,7 +160,6 @@ Client_i::test_for_new_interval (void)
 
       ACE_ASSERT ((TIO_server->time_interval ()).lower_bound == 666666666);
       ACE_ASSERT ((TIO_server->time_interval ()).upper_bound == 999999999);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -383,7 +379,6 @@ Client_i::init (int argc, ACE_TCHAR **argv)
 
           if (this->obtain_initial_references () == -1)
             return -1;
-
         }
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index b7d1d806e47..2ddafeff55d 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -98,7 +98,6 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void)
 
           str =
             CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in ());
-
         }
       catch (const CORBA::Exception& e)
         {
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 7367ccf75f7..1b00b7efc57 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -121,7 +121,6 @@ int failure = 0;
         TAO_Offer_Importer offer_importer(lookup_if.in(), verbose);
 
         offer_importer.perform_queries ();
-
       }; // End of Trading service scope.
       //-----------------------------------------------------------------------
       ACE_DEBUG ((LM_DEBUG, "*** Shutting down.\n"));
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index 0518dd80ef6..7b553031a5c 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -115,7 +115,6 @@ IOR_corbaname_Client_i::init (int argc, ACE_TCHAR **argv)
                            "%s: Address of naming context not specified\n",
                            this->argv_[0]),
                            -1);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index cafd991d555..d446e57b198 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -49,7 +49,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       // Destroy the POA, waiting until the destruction terminates
       poa->destroy (true, true);
       orb->destroy ();
-
     }
   catch (const CORBA::SystemException& ex)
     {