Removed extra newline before closing }

39 files changed, 0 insertions, 67 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index e04a1d22fcd..15a3da0fa7a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -583,7 +583,6 @@ Connection_Manager::destroy (const ACE_CString &flowname)
   this->receivers_.unbind (flowname);
 
   this->streamctrls_.unbind (flowname );
-
 }
 
 Connection_Manager::Receivers &
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
index 535b16c0b06..459ccf9fa56 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -127,7 +127,6 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo
 
     }
   return true;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 49d8fc18d9b..aa0dcd94807 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -71,7 +71,6 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows
 
     }
   return 1;
-
 }
 
 Receiver_Callback::Receiver_Callback (void)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 2a384f91291..9af75d01c61 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -181,7 +181,6 @@ Client::Client (void)
     protocol_ (ACE_OS::strdup ("UDP"))
 {
   endpoint_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ());
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 805b34997c8..4b74dfdff1c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -60,7 +60,6 @@ Sender::shutdown (void)
 
       // Shut the orb down.
   TAO_AV_CORE::instance ()->orb ()->shutdown (0);
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
index 76f54988e36..562a0c7b7f3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h
@@ -101,5 +101,4 @@ protected:
 
   /// Receiver MMDevice.
   TAO_MMDevice *mmdevice_;
-
 };
diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
index 9c9670f5b46..f9ea2ede22a 100644
--- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerORBInitializer.cpp
@@ -20,7 +20,6 @@ Server_ORBInitializer::post_init (
 {
   this->register_server_request_interceptors (info
                                               );
-
 }
 
 void
@@ -40,7 +39,6 @@ Server_ORBInitializer::register_server_request_interceptors (
 
   info->add_server_request_interceptor (server_interceptor.in ()
                                         );
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
index b23dc33a54e..632ebfabf87 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/MessengerServer.cpp
@@ -69,7 +69,6 @@ ACE_TMAIN(int argc, ACE_TCHAR * argv[])
   }
 
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
index d17f53abbe8..4b49e5f9559 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp
@@ -121,6 +121,5 @@ CORBA::Boolean Messenger_i::send_message (
   consumer_proxy_->push_structured_event(event);
 
   return 1;
-
 }
 
diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
index b11df7abb34..03dbefa4624 100644
--- a/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
+++ b/TAO/orbsvcs/tests/Bug_3387_Regression/StructuredEventSupplier_i.cpp
@@ -16,7 +16,6 @@ StructuredEventSupplier_i::disconnect_structured_push_supplier ()
    PortableServer::POA_var poa = current->get_POA ();
    PortableServer::ObjectId_var objectId = current->get_object_id ();
    poa->deactivate_object (objectId.in());
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
index 45d43b27eca..04d12398ace 100644
--- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientORBInitializer.cpp
@@ -21,5 +21,4 @@ ClientORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info)
     client_interceptor = cri;
 
   info->add_client_request_interceptor (client_interceptor.in ());
-
 }
diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
index c1b275f824f..d1ee5370765 100644
--- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
+++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp
@@ -70,5 +70,4 @@ Client_Task::svc (void)
     }
 
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 685fcba8db5..9473b645f16 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -380,7 +380,6 @@ Test_Consumer::connect (int event_a,
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
                                                 qos.get_ConsumerQOS ());
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index 898287edee4..4723d3c58b0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -102,7 +102,6 @@ EC_Schedule::execute_test (void)
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG,
                 "EC_Schedule (%P|%t) schedule dumped\n"));
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
index a48b544a703..939f3218210 100644
--- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp
@@ -47,7 +47,6 @@ EC_Counting_Consumer::deactivate (void)
   PortableServer::ObjectId_var consumer_id =
     consumer_poa->servant_to_id (this);
   consumer_poa->deactivate_object (consumer_id.in ());
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index a97beb2f677..086662e4d48 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -331,7 +331,6 @@ EC_Driver::deactivate_ec (void)
 
   if (this->verbose ())
     ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) EC deactivated\n"));
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 4ff32c986ca..131f9e30512 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -106,7 +106,6 @@ namespace FTAPP
 
 
   };
-
 } // namespace TAO
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
index 4a2acdef8fc..3c5a3bab53d 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -96,7 +96,6 @@ namespace TAO
      */
     int have_replication_manager_;
   };
-
 } // namespace TAO
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
index b2a7b5e77dd..4276d42ff26 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp
@@ -29,7 +29,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
@@ -146,7 +145,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
@@ -200,7 +198,6 @@ LB_server::create_object_group (const char *group_name)
     }
 
   return 0;
-
 }
 
 int
@@ -265,7 +262,6 @@ LB_server::remove_servant (const char *loc)
     }
 
   return 0;
-
 }
 
 TAO_Naming_Client&
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 25323e14cad..d01246bfada 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -473,7 +473,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
   return rc;
-
 }
 
 //==============================================================================
@@ -1324,7 +1323,6 @@ do_persistence_name_test (
   }
 
   return RC_SUCCESS;
-
 }
 
 
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 603eb0086e8..b51bfac2a0d 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -29,7 +29,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
@@ -144,7 +143,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
@@ -186,7 +184,6 @@ LB_server::create_object_group (void)
     }
 
   return 0;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
index 88418d36e0c..4d2423caf54 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp
@@ -676,5 +676,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
 
   return 0;
-
 }
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 2e9fb65c602..17231082463 100644
--- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp
@@ -27,7 +27,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 0;
-
 }
 
 CORBA::ORB_ptr
@@ -142,7 +141,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 0;
-
 }
 
 int
@@ -217,7 +215,6 @@ LB_server::create_object_group (void)
     }
 
   return 0;
-
 }
 
 int
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 159b2cbcd5c..0d49d05f636 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -74,7 +74,6 @@ int PushSupplier_impl::init(RtecEventChannelAdmin::EventChannel_ptr channel)
     -1);
 
   return 0;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
index 8c8247294ea..283eaaf36c0 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp
@@ -63,7 +63,6 @@ Ping_Death_Request_Interceptor::receive_request_service_contexts (
   throw ::CORBA::TRANSIENT
     ( CORBA::SystemException::_tao_minor_code (TAO_POA_HOLDING, 1),
       CORBA::COMPLETED_NO);
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
index 524455780c1..2d6e14f416a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/servers_list/Test_i.cpp
@@ -34,5 +34,4 @@ Test_i::abort (CORBA::Short delay_secs)
   ACE_NEW(mb, ACE_Message_Block(2));
   ACE_OS::sprintf(mb->wr_ptr (), "%d", delay_secs);
   terminator_.putq(mb);
-
 }
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index d2ab16ff3a5..0afb62d3c28 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -138,7 +138,6 @@ NContextExt_Client_i::get_name ()
   *name_componentPtr = '\0';
 
   return name_component;
-
 }
 
 int
@@ -321,5 +320,4 @@ NContextExt_Client_i::print_values (CosNaming::Name name,
 
  ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("The URL form of the string is \n %C\n"),
              url_string.in ()));
-
 }
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 b269b4cd18a..78b94429c09 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -29,7 +29,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
@@ -135,7 +134,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -178,7 +176,6 @@ LB_server::create_object_group (void)
     }
 
   return 1;
-
 }
 
 int
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 86eb6d82c58..88dac29fa65 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
@@ -36,7 +36,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
@@ -117,7 +116,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -157,7 +155,6 @@ LB_server::create_object_group (void)
     }
 
   return 1;
-
 }
 
 
@@ -176,7 +173,6 @@ LB_server::get_object_group (void)
     }
 
   return 1;
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
index cef4b099a21..5a9c2c5027b 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp
@@ -44,7 +44,6 @@ LB_Factory_Server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
@@ -66,7 +65,6 @@ LB_Factory_Server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -195,6 +193,5 @@ LB_Factory_Server::init (void)
     }
 
   return 1;
-
 }
 
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
index 6febfc8546c..53262b5b65e 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp
@@ -45,7 +45,6 @@ LB_server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
@@ -67,7 +66,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -169,7 +167,6 @@ LB_server::init (void)
     }
 
   return 1;
-
 }
 
 int
@@ -270,5 +267,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2, const char
     }
 
   return 1;
-
 }
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
index 8c7b5ca40c2..135e228f1ef 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp
@@ -51,7 +51,6 @@ Factory::create_object (
   this->oid_ = this->poa_->servant_to_id (servant);
 
   return servant->_this ();
-
 }
 
 void
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 6150e701400..c1fe0ef575c 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -35,7 +35,6 @@ LB_server::run (void)
       return -1;
     }
   return 1;
-
 }
 
 
@@ -57,7 +56,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 int
@@ -146,7 +144,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -242,5 +239,4 @@ LB_server::create_object_group (const char *loc_1, const char *loc_2)
     }
 
   return 1;
-
 }
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 ea93044934d..6433cb05cc7 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
@@ -31,7 +31,6 @@ LB_server::destroy (void)
       return -1;
     }
   return 1;
-
 }
 
 CORBA::ORB_ptr
@@ -100,7 +99,6 @@ LB_server::start_orb_and_poa (void)
     }
 
   return 1;
-
 }
 
 int
@@ -139,7 +137,6 @@ LB_server::create_basic_object_group (void)
     }
 
   return 1;
-
 }
 
 int
@@ -178,7 +175,6 @@ LB_server::create_simple_object_group (void)
     }
 
   return 1;
-
 }
 
 int
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 d59481f87cd..370cffe3c23 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
@@ -55,7 +55,6 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[])
     }
 
   ACE_RETURN(0);
-
 }
 
 int
@@ -249,7 +248,6 @@ int BasicLog_Test::display_records ()
                rec_list[j].id, rec_list[j].time));
 
   return 0;
-
 }
 */
 int BasicLog_Test::write_records (CORBA::ULongLong numberOfRecords)
@@ -711,5 +709,4 @@ BasicLog_Test::test_capacity_alarm_threshold (void)
   this->write_records (0);
 
   return 0;
-
 }
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index 26893522ce8..753ac74d846 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -108,7 +108,6 @@ IdAssignment::init (int argc,
     CosNotifyChannelAdmin::EventChannelFactory::_narrow (
         obj.in()
       );
-
 }
 
 CosNotifyChannelAdmin::ChannelID
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 31b9baac697..e67251706c4 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -1560,7 +1560,6 @@ Consumer_Main::init_sequence_proxy_supplier (void)
   this->sequence_proxy_push_supplier_->connect_sequence_push_consumer (
     this->sequence_push_consumer_ref_.in ());
   this->sequence_push_consumer_.set_connected(true);
-
 }
 
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 3b89f49dbcc..071e9000daf 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -126,7 +126,6 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (void)
   LOOKUP_MANAGER->resolve (driver);
 
   driver->shutdown ();
-
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 6d6c95ac717..6ff51a9ec3e 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -536,5 +536,4 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
   // All tests have passed up to this point
   return 0;
-
 }