Index: /source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- /source/ariba/overlay/modules/chord/Chord.cpp	(revision 5674)
+++ /source/ariba/overlay/modules/chord/Chord.cpp	(revision 5675)
@@ -250,4 +250,7 @@
 		logging_info("new routing neighbor: " << remote.toString()
 				<< " with link " << lnk.toString());
+		// replace with new link
+		if (!item->info.isUnspecified())
+			baseoverlay.dropLink(item->info);
 		item->info = lnk;
 	} else { // no-> add orphan entry to routing table