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

129 files changed, 0 insertions, 160 deletions

diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index 0a9b2bf4c59..401f345bb5a 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -127,7 +127,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "ORB finished\n"));
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index 1afcd61030d..d9416804bc3 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -161,7 +161,6 @@ TimeoutClient::send (CORBA::Boolean async,
       // Trap this exception and continue...
       ACE_DEBUG ((LM_DEBUG,
                   " timeout "));
-
     }
 
   // get rid of the policy, you created before.
diff --git a/TAO/tests/Alt_Mapping/client.cpp b/TAO/tests/Alt_Mapping/client.cpp
index 780738d3232..b7751a8c753 100644
--- a/TAO/tests/Alt_Mapping/client.cpp
+++ b/TAO/tests/Alt_Mapping/client.cpp
@@ -105,7 +105,6 @@ Alt_Mapping_Client<T>::run_sii_test (void)
                       "run_sii_test exception in iteration %d",
                       i));
           goto loop_around;
-
         }
 
       if (!this->test_object_->check_validity ())
diff --git a/TAO/tests/Alt_Mapping/driver.cpp b/TAO/tests/Alt_Mapping/driver.cpp
index da6e7f6e0ff..829a8834d05 100644
--- a/TAO/tests/Alt_Mapping/driver.cpp
+++ b/TAO/tests/Alt_Mapping/driver.cpp
@@ -91,7 +91,6 @@ Driver::init (int argc, ACE_TCHAR **argv)
       ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed.");
 
       this->objref_ = Alt_Mapping::_narrow (temp.in());
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
index 95673f39d4b..771849b9cd3 100644
--- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
+++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp
@@ -87,7 +87,6 @@ Test_Unbounded_Struct_Sequence::run_sii_test (
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Struct_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index 8a333958ed6..8ea1c79868a 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/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/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 7e84160fe48..7c14fc00199 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -137,7 +137,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       server->shutdown ();
 
       root_poa->destroy (true, true);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 088b74d2433..6730ae08be9 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -171,7 +171,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             }
 
           session_list[j]->start (other_sessions);
-
         }
 
       ACE_DEBUG ((LM_DEBUG ,"done\n"));
@@ -196,7 +195,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       for (j = 0; j != peer_count; ++j)
         {
           session_list[j]->destroy ();
-
         }
 
       ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n"));
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 29ee60a3bdf..845bf6af72c 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -192,7 +192,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       for (j = 0; j != peer_count; ++j)
         {
           session_list[j]->destroy ();
-
         }
 
       ACE_DEBUG ((LM_DEBUG, "Shutdown all peers . . .\n"));
diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
index 873e414d900..e3e80c625f6 100644
--- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
+++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp
@@ -150,7 +150,6 @@ Thread_Pool::svc (void)
                       pload.length (10);
                       ACE_OS::memset (pload.get_buffer(), pload.length(), 0);
                       echo->echo_payload (pload);
-
                     }
                   else
 #endif /*if 0*/
diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index a0d3ff9494b..3b55807be47 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -149,7 +149,6 @@ test_no_implicit_activation (
       // Implicit activation should fail
       Test_var myservant =
           myhello._this ();
-
     }
   catch (const PortableServer::POA::WrongPolicy& )
     {
diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp
index bde40aa87ad..6ce82f6dbf0 100644
--- a/TAO/tests/Bug_1693_Test/client.cpp
+++ b/TAO/tests/Bug_1693_Test/client.cpp
@@ -64,7 +64,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                              "ERROR: Extracted value not equal "
                              "to the encoded value\n"),
                             -1);
-
       }
 
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/Bug_2188_Regression/client.cpp b/TAO/tests/Bug_2188_Regression/client.cpp
index 760e604f85c..172238de6b5 100644
--- a/TAO/tests/Bug_2188_Regression/client.cpp
+++ b/TAO/tests/Bug_2188_Regression/client.cpp
@@ -63,7 +63,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       atobj->a_charArray (char_array.in ());
 
       ACE_DEBUG ((LM_DEBUG, "a_charArray worked OK.\n"));
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
index 607fe5ff843..bdce1f67b07 100644
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ b/TAO/tests/Bug_2429_Regression/client.cpp
@@ -37,7 +37,6 @@ class Reply_Handler
       ACE_DEBUG ((LM_DEBUG,
                   "client: parentMethod reply %d @ %T\n",
                   ++parentMethod_count));
-
     }
 
    virtual void
diff --git a/TAO/tests/Bug_2560_Regression/client.cpp b/TAO/tests/Bug_2560_Regression/client.cpp
index 183a0b9f114..60590fba8fb 100644
--- a/TAO/tests/Bug_2560_Regression/client.cpp
+++ b/TAO/tests/Bug_2560_Regression/client.cpp
@@ -42,7 +42,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
         cout << "The price of a stock in \"" << full_name.in () << "\" is $" << price << endl;
         cout << "  history: " << history[0] << " " << history[1] << " ... " << history[history->length()-1] << endl ;
-
       } catch (Quoter::Invalid_Stock_Symbol &) {
         cerr << "Invalid stock symbol <" << argv[i] << ">" << endl;
       }
diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp
index b01a90b4eee..22b5f692ac5 100644
--- a/TAO/tests/Bug_2654_Regression/client.cpp
+++ b/TAO/tests/Bug_2654_Regression/client.cpp
@@ -95,7 +95,6 @@ Worker::svc()
           ACE_Time_Value udelay(0,400);
           struct timespec ts = udelay;
           ACE_OS::nanosleep (&ts);
-
         }
       catch (const CORBA::Exception &ex)
         {
@@ -280,7 +279,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       }
 
       init_callback(worker);
-
     }
   catch (const CORBA::Exception &ex)
     {
diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp
index 8171f77019c..009ca878c1e 100644
--- a/TAO/tests/Bug_2669_Regression/client.cpp
+++ b/TAO/tests/Bug_2669_Regression/client.cpp
@@ -145,7 +145,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       poa_var->destroy (1,0);
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp
index fa6bb4d539c..cdba93ea310 100644
--- a/TAO/tests/Bug_2683_Regression/client.cpp
+++ b/TAO/tests/Bug_2683_Regression/client.cpp
@@ -131,7 +131,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       pinger.wait();
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) client done\n"));
-
     }
   catch (const CORBA::Exception &ex)
     {
diff --git a/TAO/tests/Bug_2935_Regression/source_i.cpp b/TAO/tests/Bug_2935_Regression/source_i.cpp
index dec6db49ea3..e70de79322a 100644
--- a/TAO/tests/Bug_2935_Regression/source_i.cpp
+++ b/TAO/tests/Bug_2935_Regression/source_i.cpp
@@ -38,7 +38,6 @@ Source_i::run ()
                   (int)tickCount, (int)tockCount));
 
       target_->shutdown ();
-
     }
   catch (const CORBA::Exception& ex)
   {
diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp
index 92c4e1532bb..dbdebb13338 100644
--- a/TAO/tests/Bug_3171_Regression/server.cpp
+++ b/TAO/tests/Bug_3171_Regression/server.cpp
@@ -119,7 +119,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                           1);
 
       worker.thr_mgr ()->wait ();
-
     }
     ACE_DEBUG ((LM_DEBUG, "Event loop finished\n"));
   }
diff --git a/TAO/tests/Bug_3506_Regression/client.cpp b/TAO/tests/Bug_3506_Regression/client.cpp
index 3367db61380..5f91c4258e6 100644
--- a/TAO/tests/Bug_3506_Regression/client.cpp
+++ b/TAO/tests/Bug_3506_Regression/client.cpp
@@ -97,7 +97,6 @@ public:
             ACE_ERROR_RETURN ((LM_DEBUG,
                                          "Reference is not of type IF_EXE_M_R::IF_ExeCtrlData\n"),
                                         1);
-
           }
         client->foo (ts);
         if (shutdown)
diff --git a/TAO/tests/Bug_3506_Regression/server.cpp b/TAO/tests/Bug_3506_Regression/server.cpp
index 7ca7b21c08a..e16cafeb09e 100644
--- a/TAO/tests/Bug_3506_Regression/server.cpp
+++ b/TAO/tests/Bug_3506_Regression/server.cpp
@@ -52,7 +52,6 @@ public:
                                ts.whatEver._tao_get_typecode()->id(),
                                ts.whatEver._tao_get_typecode()->name(),
                                ts.whatEver._tao_get_typecode()->kind()));
-
       }
     else
       {
diff --git a/TAO/tests/Bug_3531_Regression/test_i.cpp b/TAO/tests/Bug_3531_Regression/test_i.cpp
index 5748d90de35..7e05d4d9de1 100644
--- a/TAO/tests/Bug_3531_Regression/test_i.cpp
+++ b/TAO/tests/Bug_3531_Regression/test_i.cpp
@@ -35,7 +35,6 @@ Simple_Server_i::test_method (Simple_Server_ptr objref)
                       "which will sleep for 3 seconds\n"));
           CORBA::String_var str = objref->test_method (_this());
           ACE_DEBUG ((LM_DEBUG, "(%P|%t) Received \"%C\"\n", str.in ()));
-
         }
       catch (...)
         {
diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp
index c01796bd2c4..8f83f1a53d4 100644
--- a/TAO/tests/Bug_3672_Regression/client.cpp
+++ b/TAO/tests/Bug_3672_Regression/client.cpp
@@ -270,7 +270,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     {
       ex._tao_print_exception ("Caught exception:");
       return 1;
-
     }
 
   return parameter_corruption;
diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
index 85475c11224..8ecb7692921 100644
--- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp
+++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp
@@ -309,8 +309,6 @@ Client<ServerInterface>::init (const char *,
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("no ior or naming options  specified\n")),
                           -1);
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp
index fc00327e5f5..61e4e94f853 100644
--- a/TAO/tests/Bug_3953_Regression/server.cpp
+++ b/TAO/tests/Bug_3953_Regression/server.cpp
@@ -187,7 +187,6 @@ ACE_TMAIN (int argc, ACE_TCHAR **argv)
         ++result;
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index d2f3d5830ab..5ff11f23e7b 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -191,7 +191,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           if (!quiet)
             ACE_OS::printf ("AVE: %d %f\n",
                             i, average);
-
         }
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
index 76f15b8057c..6220eeda46c 100644
--- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp
@@ -92,7 +92,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
 
   return 0;
 
-
 }
 
 int
diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp
index 9aaf7b50507..86f0234cdc4 100644
--- a/TAO/tests/Collocation/Collocation_Tester.cpp
+++ b/TAO/tests/Collocation/Collocation_Tester.cpp
@@ -73,7 +73,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
 
   return 0;
 
-
 }
 
 int
diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp
index 3ce87e99c89..8de90b314a4 100644
--- a/TAO/tests/Compression/RLECompressorTest.cpp
+++ b/TAO/tests/Compression/RLECompressorTest.cpp
@@ -196,7 +196,6 @@ static int init_compressor(::CORBA::ORB_ptr orb)
         Compression::CompressorFactory_var compr_fact = compressor_factory;
 
         manager->register_factory (compr_fact.in ());
-
     } catch (...) {
         ACE_ERROR_RETURN((LM_ERROR,
             ACE_TEXT("ERROR: Unable to initialise RLE compressor manager.\n")),-1);
@@ -568,7 +567,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         ACE_DEBUG((LM_INFO, ACE_TEXT("TAO::RLECompression Ratio = %f : 1\n"), tao_ratio));
 
         orb->shutdown ();
-
     } catch (const CORBA::Exception& ex) {
         ex._tao_print_exception ("RLECompressorTest: UNEXPECTED exception - ");
         return -1;
diff --git a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
index 3d1588d4a80..467676c1830 100644
--- a/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
+++ b/TAO/tests/DII_AMI_Forward/DII_ReplyHandler.cpp
@@ -118,5 +118,4 @@ DII_ReplyHandler::handle_location_forward (TAO_InputCDR &incoming,
   req->add_in_arg ("text") <<= CORBA::Any::from_string(test_string.in(),30);
   req->sendc(this);
 
-
 }
diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
index 4514bbe40e9..f1cfbec1038 100644
--- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp
@@ -203,8 +203,6 @@ Client_Task::svc (void)
       req = obj->_request ("shutdown");
 
       req->send_oneway ();
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
index f606a470b9b..340f5d9b3a2 100644
--- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
+++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp
@@ -275,8 +275,6 @@ Client_Task::svc (void)
       req = obj->_request ("shutdown");
 
       req->send_oneway ();
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp
index 9f6dbfeefb3..eda5079b763 100644
--- a/TAO/tests/DIOP/UDP_Client_i.cpp
+++ b/TAO/tests/DIOP/UDP_Client_i.cpp
@@ -69,7 +69,6 @@ UDP_Client_i::svc (void)
       // Shut down local ORB, trigger the end of the ORB event loop
           // in the main thread.
       orb_->shutdown ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 8d54d570503..b93e888e36c 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -179,7 +179,6 @@ Test_Client_Module::svc (void)
       // is used, i.e. one isn't explicitly loaded prior to initializing
       // the ORB.
       (void) this->test_.out ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index 22f195a7961..0ea3edfc135 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -89,7 +89,6 @@ Driver::init (int argc, ACE_TCHAR *argv[])
                           "(%N:%l) driver.cpp - "
                           "parse_args failed\n"),
                           -1);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
index e31abbae306..1361b7cfd31 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/server.cpp
@@ -112,8 +112,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       root_poa->destroy (true, true);
 
       orb->destroy ();
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
index 8a860e19ad8..57f789cdc5f 100644
--- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
+++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/server.cpp
@@ -190,8 +190,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       root_poa->destroy (true, true);
 
       orb->destroy ();
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 9201a12b92e..be292821e7f 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -192,7 +192,6 @@ Policy_Verifier::verify_reference (Counter_ptr object,
                        (pb[i].high !=  rt_properties->priority_bands ()[i].high)))
                     ACE_DEBUG ((LM_DEBUG,
                                 ACE_TEXT ("Mismatching Priority Band Range!\n")));
-
                 }
             }
         }
@@ -211,7 +210,6 @@ Policy_Verifier::verify_reference (Counter_ptr object,
             ACE_DEBUG ((LM_DEBUG,
                         ACE_TEXT ("\nThe Client Protocol Type: %d\n"),
                         protocol_list[i].protocol_type));
-
         }
 
     }
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index 8f90aef7cfc..350a5a8a7ca 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -49,7 +49,6 @@ RT_Properties::read_from (const ACE_TCHAR *file_name)
           ACE_UNUSED_ARG (n_matched);
 
           rt_properties->priority_bands_.length (int_field);
-
         }
       else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0)
         {
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index 8d12a41c115..e935a3990ef 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -168,7 +168,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
 
       root_poa->destroy (true, true);
-
     }
   catch (const CORBA::COMM_FAILURE& x)
     {
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index ae995dcc6c6..bf9df187fbc 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -122,7 +122,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "middle - event loop finished\n"));
 
       root_poa->destroy (true, true);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp
index 406b9968117..c087183bf73 100644
--- a/TAO/tests/ForwardOnceUponException/client.cpp
+++ b/TAO/tests/ForwardOnceUponException/client.cpp
@@ -207,7 +207,6 @@ Worker::svc (void)
             ACE_DEBUG ((LM_DEBUG,
                         "(%P|%t) unexpected result = %d\n",
                         r));
-
         }
         catch (const CORBA::OBJECT_NOT_EXIST &)
           {
diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp
index e568d3dda7d..2aa6f4a118b 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -209,7 +209,6 @@ namespace Test
         ACE_Thread_Manager::instance ()->wait ();
 
         orb->destroy ();
-
       }
     catch (const CORBA::Exception& ex)
       {
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 581666b8b26..0ae36756d03 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -201,7 +201,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // Finally generate an exception and quit.
       // This will generate a NotFound exception.
       in_count = iorm->is_in_ior (just2.in (), name1.in ());
-
     }
   catch (const TAO_IOP::EmptyProfileList& userex)
     {
diff --git a/TAO/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp
index 27649c77a50..64c5acf73df 100644
--- a/TAO/tests/MT_BiDir/Client_Task.cpp
+++ b/TAO/tests/MT_BiDir/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/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
index 104c80b2034..362d4ab9cb3 100644
--- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
+++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp
@@ -201,7 +201,6 @@ Worker::svc (void)
           ACE_DEBUG ((LM_DEBUG,
                       "(%P|%t) unexpected result = %d\n",
                       r));
-
       }
       catch (const CORBA::OBJECT_NOT_EXIST &)
         {
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index 331d2929eb5..5005fe0a71a 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -278,7 +278,6 @@ SelfClient::svc (void)
                     {
                       ACE_DEBUG ((LM_DEBUG,
                                   "(%P|%t)  Not found it\n"));
-
                     }
                   else
                     {
@@ -295,7 +294,6 @@ SelfClient::svc (void)
 
           // Just make a call
           this->server_->test_method (i);
-
         }
     }
   catch (const CORBA::Exception& ex)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
index 9a4d50cc28b..826349cd30e 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp
@@ -42,7 +42,6 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr)
       ACE_Time_Value pause(0, usecs);
 
       ACE_OS::sleep(pause);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index ab5273dcd11..cf08b7f0dee 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -187,7 +187,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test finished\n"));
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/OBV/Indirection/MessengerClient.cpp b/TAO/tests/OBV/Indirection/MessengerClient.cpp
index 120703e5fcd..78b97b1efd8 100644
--- a/TAO/tests/OBV/Indirection/MessengerClient.cpp
+++ b/TAO/tests/OBV/Indirection/MessengerClient.cpp
@@ -86,7 +86,6 @@ int ACE_TMAIN (int ac, ACE_TCHAR* av[]) {
     }
 
     orb->destroy();
-
   } catch(const CORBA::Exception& e) {
     std::cerr << e << std::endl;
     return 1;
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 3b5070f3c05..4f75ce7bbad 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -259,8 +259,6 @@ Client<InterfaceObj, Var>::init (const char *name,
         ACE_ERROR_RETURN ((LM_ERROR,
                            "no ior or naming options  specified\n"),
                           -1);
-
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index dea938ec420..bce89aa4c2b 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -175,7 +175,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           ACE_ASSERT (test_graph->size () == 6);
           my_test->pass_obj_graph_inout (test_graph.inout ());
           ACE_ASSERT (test_graph->size () == 7);
-
         }
 
       my_test->finish ();
@@ -185,7 +184,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       orb->destroy ();
 
       ACE_DEBUG ((LM_DEBUG, "Client (%P.%t) completed test successfully\n", id));
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp
index 8d995b4842b..c82ad1d6853 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -1165,7 +1165,6 @@ int test_boxed_array_invocations (Test * test_object)
       p4->_remove_ref ();
       p5->_remove_ref ();
       p6->_remove_ref ();
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -1395,7 +1394,6 @@ int test_boxed_union_invocations (Test * test_object)
       p4->_remove_ref ();
       p5->_remove_ref ();
       p6->_remove_ref ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
index 168021f9f20..d33a9071f03 100644
--- a/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
+++ b/TAO/tests/ORB_Local_Config/Bug_3049/Test.cpp
@@ -67,7 +67,6 @@ testBug3049 (int , ACE_TCHAR *[])
 
     if (error > 0)
       return -1;
-
   }
   catch(const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 22d0339e8ec..a58a78a46f1 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -63,7 +63,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       root_poa->destroy (true, true);
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index fc56e946f15..65ad651ab78 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -103,7 +103,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Calling shutdown\n"));
       server->shutdown ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Oneway_Send_Timeouts/Client.cpp b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
index ce1a086c0a5..47e8bdf21fe 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Client.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Client.cpp
@@ -131,7 +131,6 @@ Client::init (int argc, ACE_TCHAR* argv[])
     policy_list[0]->destroy ();
     policy_list[1]->destroy ();
     policy_list.length(0);
-
   }
   catch( CORBA::Exception& ex) {
     ACE_ERROR ((LM_ERROR, "(%P|%t) Client::Init> Caught CORBA::Exception %s"
diff --git a/TAO/tests/Oneway_Send_Timeouts/Server.cpp b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
index d4757949f57..86caa6f0a56 100644
--- a/TAO/tests/Oneway_Send_Timeouts/Server.cpp
+++ b/TAO/tests/Oneway_Send_Timeouts/Server.cpp
@@ -201,7 +201,6 @@ Server::shutdown ()
   catch( CORBA::Exception& ex) {
     ACE_ERROR ((LM_ERROR, "(%P|%t) Server::run> Caught CORBA::Exception %s"
                 , ex._info().c_str()));
-
   }
 
   shutdown_ = true;
diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp
index 9aea898d1c0..c08515ff8ad 100644
--- a/TAO/tests/POA/Loader/Server_Manager.cpp
+++ b/TAO/tests/POA/Loader/Server_Manager.cpp
@@ -121,7 +121,6 @@ Server_i::init (int argc, ACE_TCHAR **argv)
 
       // Get the POAManager of RootPOA
       poa_manager_ = root_poa_->the_POAManager ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
index 8d7e87ee689..da78afe52c6 100644
--- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
+++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp
@@ -90,7 +90,6 @@ Server_Task::svc (void)
        first_poa = root_poa->create_POA (name.c_str (),
                                          poa_manager.in (),
                                          policies);
-
      }
 
      // Destroy the policy objects as they have been passed to
diff --git a/TAO/tests/POA/On_Demand_Activation/server.cpp b/TAO/tests/POA/On_Demand_Activation/server.cpp
index f375dca2cb6..0d892a9bcc6 100644
--- a/TAO/tests/POA/On_Demand_Activation/server.cpp
+++ b/TAO/tests/POA/On_Demand_Activation/server.cpp
@@ -148,7 +148,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         first_poa = root_poa->create_POA (name.c_str (),
                                           poa_manager.in (),
                                           policies);
-
       }
 
       PortableServer::POA_var second_poa;
@@ -165,7 +164,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         second_poa = root_poa->create_POA (name.c_str (),
                                            poa_manager.in (),
                                            policies);
-
       }
 
       // Destroy the policy objects as they have been passed to
diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
index b920ffbfda4..897aab72173 100644
--- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp
@@ -126,7 +126,6 @@ Server_i::init (int argc, ACE_TCHAR **argv)
 
       // Get the POAManager of RootPOA
       poa_manager_ = root_poa_->the_POAManager ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp
index 665479c78e3..8616f65d5e4 100644
--- a/TAO/tests/Param_Test/bd_array_seq.cpp
+++ b/TAO/tests/Param_Test/bd_array_seq.cpp
@@ -128,7 +128,6 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Bounded_Array_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index 7354e5c44b6..1e7190fd7ea 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -115,7 +115,6 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Bounded_Long_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 4e0a2cf1bbd..a87ad18369c 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -121,7 +121,6 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Bounded_Short_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index a8f73b80538..fadfb85b3e4 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -113,7 +113,6 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Bounded_String_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index 4295ab113cb..c9062c29397 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -126,7 +126,6 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Bounded_String::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index c91122d68ab..76456620945 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -119,7 +119,6 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Bounded_Struct_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp
index 544840dd110..6b52e20bf89 100644
--- a/TAO/tests/Param_Test/bd_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp
@@ -113,7 +113,6 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Bounded_WString_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp
index eab4463dedc..904158bd400 100644
--- a/TAO/tests/Param_Test/bd_wstring.cpp
+++ b/TAO/tests/Param_Test/bd_wstring.cpp
@@ -127,7 +127,6 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Bounded_WString::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
index 044f92400d0..edaac0d77f3 100644
--- a/TAO/tests/Param_Test/big_union.cpp
+++ b/TAO/tests/Param_Test/big_union.cpp
@@ -228,7 +228,6 @@ Test_Big_Union::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Big_Union::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 94c090ff8ca..6fa43b8100d 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -105,7 +105,6 @@ Param_Test_Client<T>::run_sii_test (void)
                       "run_sii_test exception in iteration %d",
                       i));
           goto loop_around;
-
         }
 
       if (!this->test_object_->check_validity ())
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 4679ef3e155..c8f09c69933 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -100,7 +100,6 @@ Driver::init (int argc, ACE_TCHAR **argv)
       ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed.");
 
       this->objref_ = Param_Test::_narrow (temp.in());
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -616,7 +615,6 @@ Driver::run (void)
 
       this->objref_ = Param_Test::_nil ();
       this->orb_->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index c53e30d5782..61f5c079118 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -106,7 +106,6 @@ Test_Fixed_Array::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Fixed_Array::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index ad71a5f7a03..15c7488bdca 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -106,7 +106,6 @@ Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Fixed_Struct::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 77402115ff3..c12b5d945c3 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -132,7 +132,6 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Nested_Struct::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 2bed0f53148..74dad5fa189 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -149,7 +149,6 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_ObjRef::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 7f67712e794..188a7011a87 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -94,7 +94,6 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Objref_Struct::init_parameters\n");
-
     }
   return -1;
 }
@@ -132,7 +131,6 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Objref_Struct::run_sii_test\n");
-
     }
   return -1;
 }
@@ -176,7 +174,6 @@ Test_Objref_Struct::check_validity (void)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Objref_Struct::check_validity\n");
-
     }
   return 0;
 }
diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp
index 83f03893c24..328bed47e5a 100644
--- a/TAO/tests/Param_Test/recursive_struct.cpp
+++ b/TAO/tests/Param_Test/recursive_struct.cpp
@@ -119,7 +119,6 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Recursive_Struct::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp
index 3b19bc3033e..a6500e251e9 100644
--- a/TAO/tests/Param_Test/recursive_union.cpp
+++ b/TAO/tests/Param_Test/recursive_union.cpp
@@ -120,7 +120,6 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Recursive_Union::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index 3cf8c0d1d84..f2b36b8d046 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -89,7 +89,6 @@ Test_Short::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Short::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp
index a1f64a7c57c..a3f799d1576 100644
--- a/TAO/tests/Param_Test/small_union.cpp
+++ b/TAO/tests/Param_Test/small_union.cpp
@@ -128,7 +128,6 @@ Test_Small_Union::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Small_Union::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index 6dd0fa5e761..edad685cef6 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -119,7 +119,6 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_TypeCode::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index 07aab1ddf1c..f1e3064a337 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -198,7 +198,6 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_AnySeq::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp
index f899067802b..b6bc5487c9a 100644
--- a/TAO/tests/Param_Test/ub_array_seq.cpp
+++ b/TAO/tests/Param_Test/ub_array_seq.cpp
@@ -129,7 +129,6 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Array_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 21992565ad6..ace32631e54 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -109,7 +109,6 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Long_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index d57a08f8f92..a0984f2250a 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -110,7 +110,6 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_ObjRef_Sequence::init_parameters\n");
-
     }
   return -1;
 }
@@ -140,7 +139,6 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_ObjRef_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
@@ -164,7 +162,6 @@ Test_ObjRef_Sequence::check_validity (void)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_ObjRef_Sequence::check_validity");
-
     }
   return 0;
 }
@@ -246,7 +243,6 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_ObjRef_Sequence::compare");
-
     }
   return 0;
 }
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index 9138a7f0acf..c0d44106fe3 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -111,7 +111,6 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Short_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 918bba998e5..42059a4cc16 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -115,7 +115,6 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_String_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index a302f8c7036..c155a65bf85 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -127,7 +127,6 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Unbounded_String::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index 17d73b4423c..694796a5990 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -113,7 +113,6 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Struct_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp
index 5a8a760fa44..c2777d6a899 100644
--- a/TAO/tests/Param_Test/ub_wstr_seq.cpp
+++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp
@@ -111,7 +111,6 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_WString_Sequence::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp
index 2ac6eb0a5f7..0c29105ecc3 100644
--- a/TAO/tests/Param_Test/ub_wstring.cpp
+++ b/TAO/tests/Param_Test/ub_wstring.cpp
@@ -127,7 +127,6 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Unbounded_WString::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index 6f17cb122cd..241323e65f2 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -86,7 +86,6 @@ Test_ULongLong::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_ULongLong::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 845bdeafa58..21b03d99ff2 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -104,7 +104,6 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Var_Array::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 5ff52e1d467..f574a260093 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -134,7 +134,6 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Test_Var_Struct::run_sii_test\n");
-
     }
   return -1;
 }
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
index 78f43124d85..4d413d9859a 100644
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AdvSlotExt/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/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index 9411f7c39d8..bd10a07913b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -135,7 +135,6 @@ run_test (Test_Interceptors::Secure_Vault_ptr server)
 
       if (TAO_debug_level > 0 && i % 100 == 0)
         ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
-
     }
 
   marker.dump_stats (ACE_TEXT ("update records  method  "), gsf, 3);
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index fb93e7ba264..948d7cbffa9 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -116,7 +116,6 @@ Echo_Client_Request_Interceptor::receive_reply (
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
                            // overloaded operator ambiguity.
       paramlist[i].argument >>= param;
-
     }
   else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
@@ -218,7 +217,6 @@ Echo_Server_Request_Interceptor::receive_request (
       ACE_DEBUG ((LM_DEBUG,
                   "The arg is %d\n",
                   param));
-
      }
 
   CORBA::String_var tmdi =
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 5249375a979..e42b70344ca 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -135,7 +135,6 @@ Echo_Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientReque
         {
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) All parameters not available\n"));
-
         }
 
       CORBA::ULong first = 0, second = 1; // If you dont understand
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index abb69742827..961fea9f416 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -154,7 +154,6 @@ Server_Request_Interceptor::send_exception (
                   this->request_count_ - 2));
 
       throw PortableInterceptor::ForwardRequest (this->obj_[0]);
-
     }
 
 }
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
index 908941bf9ac..c5c6b00ecc7 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
@@ -120,7 +120,6 @@ Echo_Client_Request_Interceptor::receive_reply (
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
                            // overloaded operator ambiguity.
       paramlist[i].argument >>= param;
-
     }
   else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
@@ -228,7 +227,6 @@ Echo_Server_Request_Interceptor::receive_request (
       ACE_DEBUG ((LM_DEBUG,
                   "The arg is %d\n",
                   param));
-
      }
 
   CORBA::String_var tmdi =
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
index 226dee9377a..911540c26a0 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
@@ -106,7 +106,6 @@ Echo_Client_Request_Interceptor::receive_reply (
       CORBA::ULong i = 0;  // index -- explicitly used to avoid
                            // overloaded operator ambiguity.
       paramlist[i].argument >>= param;
-
     }
   else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
     {
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
index 955feb9d110..4abd69de234 100644
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
@@ -63,7 +63,6 @@ Echo_Server_Request_Interceptor::receive_request (
       ACE_DEBUG ((LM_DEBUG,
                   "The arg is %d\n",
                   param));
-
      }
 
   CORBA::String_var tmdi =
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index c49fb047aea..ae3c8de8034 100644
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -130,7 +130,6 @@ Client::create_widgets (/**/)
 
   this->mainwindow_.setLayout(&box_);
 
-
 }
 
 void
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 18c3b4a3e72..8f9b685715f 100644
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -131,7 +131,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // We choose to run the main Qt event loop..
       app.exec ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
index 5cad7a83157..a98367c6f83 100644
--- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
+++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp
@@ -211,7 +211,6 @@ Task::svc (void)
         ACE_DEBUG ((LM_DEBUG,
                     "Final priority of the servant thread"
                     " == its initial priority\n"));
-
     }
   catch (const ::CORBA::Exception & ex)
     {
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index e3de89ef387..dade2a7d8d1 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -211,7 +211,6 @@ Task::svc (void)
         ACE_DEBUG ((LM_DEBUG,
                     "Final priority of the servant thread"
                     " = its initial priority\n"));
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index f1fb70b5967..6253d484e70 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -76,7 +76,6 @@ test_mutex_simple (RTCORBA::RTORB_ptr rt_orb)
       my_mutex->unlock ();
 
       rt_orb->destroy_mutex (my_mutex.in ());
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -321,7 +320,6 @@ test_mutex_threads (RTCORBA::RTORB_ptr rt_orb)
       ACE_Thread_Manager::instance ()->wait ();
 
       CORBA::release (mutex);
-
     }
   catch (const CORBA::Exception& ex)
     {
@@ -443,7 +441,6 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
       mutex->unlock ();
 
       CORBA::release (mutex);
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 94011da03fe..1a580973dc6 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -125,7 +125,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       // Testing over. Shut down Server ORB.
       server1->shutdown ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
index db1cdfe229d..346fb25315e 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -97,7 +97,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           server->two_way (ACE_TEXT_ALWAYS_CHAR(ior.c_str ()));
 
           current->end_scheduling_segment (name);
-
         }
       catch (const CORBA::THREAD_CANCELLED& )
         {
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index be462a69223..52ed109973a 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
@@ -104,8 +104,6 @@ Thread_Task::svc (void)
       //  End - Nested Scheduling Segment
 
       this->current_->end_scheduling_segment (name);
-
-
     }
   catch (const CORBA::THREAD_CANCELLED& )
     {
diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
index 4c890461983..f57f9a70e15 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
@@ -69,7 +69,6 @@ int ACE_TMAIN (int, ACE_TCHAR *[])
       Foo_sequence u;
       Foo_sequence v(u);
       u = v;
-
     }
   catch (const ::CORBA::Exception &)
     {
diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index c0e49323d01..ff54e484019 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -116,7 +116,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       // ACE_Time_Value tv (1);
 
       // while (singleton->handle_events (&tv) >= 1);
-
     }
 
   // Handle events moved to here to prevent this test taking best part
diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
index 9af4c84e1ce..b8974757c1e 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp
@@ -15,7 +15,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy)
        ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
 
    return proxy;
-
  }
 
 Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index de9a8c43400..8ec4f0bf503 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -45,7 +45,6 @@ class Marker
       // get the sample.
       this->throughput_.sample (throughput_diff,
                                 latency_diff);
-
     }
  private:
   /// Keep throughput statistics on a per-thread basis
diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
index 6ea80855fc1..9b5a1e94d74 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp
@@ -67,7 +67,6 @@ Collocation_Test::init (int argc, ACE_TCHAR *argv[])
 
   return 0;
 
-
 }
 
 int
diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
index bcda296ad7f..47ae1744758 100644
--- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp
@@ -18,7 +18,6 @@ Smart_Diamond_Top_Factory::create_proxy (Diamond::Top_ptr proxy
                                Smart_Diamond_Top_Proxy (proxy),
                                            0);
    return proxy;
-
  }
 
 Smart_Diamond_Top_Proxy::Smart_Diamond_Top_Proxy (Diamond::Top_ptr proxy)
diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
index da799a02038..fc0bbd9672a 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp
@@ -17,7 +17,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy)
      ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
 
    return proxy;
-
  }
 
 // The following Factory is used by the <ACE_Service_Config> to
diff --git a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
index 4eb3378faa4..f287b8ec477 100644
--- a/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/Smart_Proxy_Impl.cpp
@@ -17,7 +17,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy)
        ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
 
    return proxy;
-
  }
 
 Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
index 097c5217a69..b8a035f4eab 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
+++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp
@@ -18,7 +18,6 @@ Smart_Test_Factory::create_proxy (Test_ptr proxy)
        ACE_NEW_RETURN (proxy, Smart_Test_Proxy (proxy), 0);
 
    return proxy;
-
  }
 
 Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy)
diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp
index 25f130a5545..21f5d613490 100644
--- a/TAO/tests/Stack_Recursion/Client_Task.cpp
+++ b/TAO/tests/Stack_Recursion/Client_Task.cpp
@@ -50,7 +50,6 @@ Client_Task::validate_connections (void)
       try
         {
           this->sender_->ping ();
-
         }
       catch (const CORBA::Exception&){}
     }
diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp
index 530ac296313..99eac9cedc2 100644
--- a/TAO/tests/TransportCurrent/Framework/server.cpp
+++ b/TAO/tests/TransportCurrent/Framework/server.cpp
@@ -204,7 +204,6 @@ server_main (int argc,
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Server (%P|%t) Invoking orb->destroy ()\n")));
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
index 9b5d225c9e3..875a435d594 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp
@@ -73,7 +73,6 @@ namespace Test {
                   ACE_TEXT ("push_request_info: Can't track that many requests %d\n"),
                   name.in (),
                   requestID));
-
   }
 
   void
@@ -225,7 +224,6 @@ namespace Test {
       }
 
     Server_Request_Interceptor::receive_request_service_contexts (ri);
-
   }
 
   void
@@ -234,7 +232,6 @@ namespace Test {
     try
       {
         outbound_process_context (ri);
-
       }
     catch (const CORBA::Exception&)
       {
@@ -246,7 +243,6 @@ namespace Test {
       }
 
     Server_Request_Interceptor::send_reply (ri);
-
   }
 
   void
@@ -255,8 +251,6 @@ namespace Test {
     try
       {
         outbound_process_context (ri);
-
-
       }
     catch (const CORBA::Exception&)
       {
@@ -265,7 +259,6 @@ namespace Test {
                     ACE_TEXT("%C (%P|%t) Outbound_process_context failed in  ")
                     ACE_TEXT("send_exception.\n"),
                     name.in ()));
-
       }
 
     Server_Request_Interceptor::send_exception (ri);
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
index 9133d91b07f..01942ade9e3 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -108,7 +108,6 @@ namespace Test
       {
         return !(this->operator== (ep));
       };
-
     } EndPoint;
 
   private:
diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp
index fbcecce3a26..56d431e9226 100644
--- a/TAO/tests/TransportCurrent/IIOP/server.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/server.cpp
@@ -193,7 +193,6 @@ server_main (int argc,
       server->shutdown ();
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
index 77e6554d86c..1c81ed980bb 100644
--- a/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
+++ b/TAO/tests/Transport_Cache_Manager/Bug_3549_Regression.cpp
@@ -73,7 +73,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
        }
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception&)
     {
diff --git a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
index 27c5a224c32..7b3dce3e8bf 100644
--- a/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
+++ b/TAO/tests/Transport_Cache_Manager/Bug_3558_Regression.cpp
@@ -53,7 +53,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
        }
 
       orb->destroy ();
-
     }
   catch (const CORBA::Exception&)
     {