Index: source/ariba/overlay/BaseOverlay.cpp
===================================================================
--- source/ariba/overlay/BaseOverlay.cpp	(revision 5893)
+++ source/ariba/overlay/BaseOverlay.cpp	(revision 5896)
@@ -299,7 +299,7 @@
 
 /// send a message using a link descriptor, delivers it to the base overlay class
-seqnum_t BaseOverlay::send( OverlayMsg* message, LinkDescriptor* ld, bool ignore_down ) {
+seqnum_t BaseOverlay::send( OverlayMsg* message, LinkDescriptor* ldr, bool ignore_down ) {
 	// check if null
-	if (ld == NULL) {
+	if (ldr == NULL) {
 		logging_error("Can not send message to " << message->getDestinationAddress());
 		return -1;
@@ -307,16 +307,17 @@
 
 	// check if up
-	if (!ld->up && !ignore_down) {
-		logging_error("Can not send message. Link not up:" << ld );
+	if (!ldr->up && !ignore_down) {
+		logging_error("Can not send message. Link not up:" << ldr );
 		return -1;
 	}
+	LinkDescriptor* ld = NULL;
 
 	// handle relayed link
-	if (ld->relayed) {
+	if (ldr->relayed) {
 		logging_debug("send(): Resolving direct link for relayed link to "
-			<< ld->remoteNode);
-		ld = getRelayLinkTo( ld->remoteNode );
+			<< ldr->remoteNode);
+		ld = getRelayLinkTo( ldr->remoteNode );
 		if (ld==NULL) {
-			LinkID lnk = overlayInterface->getNextLinkId(ld->remoteNode);
+			LinkID lnk = overlayInterface->getNextLinkId(ldr->remoteNode);
 			if (!lnk.isUnspecified())
 				ld = getDescriptor(lnk);