Index: source/ariba/communication/BaseCommunication.cpp
===================================================================
--- source/ariba/communication/BaseCommunication.cpp	(revision 6944)
+++ source/ariba/communication/BaseCommunication.cpp	(revision 7496)
@@ -114,5 +114,6 @@
 
 	logging_info( "Searching for local locators ..." );
-	AddressDiscovery::discover_endpoints( localDescriptor.getEndpoints() );
+	if(localDescriptor.getEndpoints().to_string().length() == 0)
+		AddressDiscovery::discover_endpoints( localDescriptor.getEndpoints() );
 	logging_info( "Done. Local endpoints = " << localDescriptor.toString() );