Index: source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp
===================================================================
--- source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp	(revision 4933)
+++ source/ariba/utility/bootstrap/modules/periodicbroadcast/PeriodicBroadcast.cpp	(revision 4934)
@@ -67,37 +67,39 @@
 	server(io_service, &newRemoteServices, &newRemoteServicesMutex) {
 
+}
+
+PeriodicBroadcast::~PeriodicBroadcast(){
+}
+
+void PeriodicBroadcast::threadFunc(PeriodicBroadcast* obj){
+	obj->io_service.run();
+}
+
+string PeriodicBroadcast::getName(){
+	return "PeriodicBroadcast";
+}
+
+string PeriodicBroadcast::getInformation(){
+	return "periodic broadcasting of service information";
+}
+
+bool PeriodicBroadcast::isFunctional(){
+	return true;
+}
+
+void PeriodicBroadcast::start(){
 	io_service_thread = new boost::thread(
-		boost::bind(&PeriodicBroadcast::threadFunc, this) );
-}
-
-PeriodicBroadcast::~PeriodicBroadcast(){
+			boost::bind(&PeriodicBroadcast::threadFunc, this) );
+
+	Timer::setInterval( timerinterval );
+	Timer::start();
+}
+
+void PeriodicBroadcast::stop(){
 	io_service.stop();
 	io_service_thread->join();
 	delete io_service_thread;
 	io_service_thread = NULL;
-}
-
-void PeriodicBroadcast::threadFunc(PeriodicBroadcast* obj){
-	obj->io_service.run();
-}
-
-string PeriodicBroadcast::getName(){
-	return "PeriodicBroadcast";
-}
-
-string PeriodicBroadcast::getInformation(){
-	return "periodic broadcasting of service information";
-}
-
-bool PeriodicBroadcast::isFunctional(){
-	return true;
-}
-
-void PeriodicBroadcast::start(){
-	Timer::setInterval( timerinterval );
-	Timer::start();
-}
-
-void PeriodicBroadcast::stop(){
+
 	Timer::stop();