Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5678)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5679)
@@ -408,8 +408,6 @@
 			send(&cmsg, item->info);
 			break;
-		}
-		}
+		}}
 		delete dmsg;
-		break;
 	}
 
Index: source/ariba/overlay/modules/chord/messages/Discovery.cpp
===================================================================
--- source/ariba/overlay/modules/chord/messages/Discovery.cpp	(revision 5678)
+++ source/ariba/overlay/modules/chord/messages/Discovery.cpp	(revision 5679)
@@ -48,4 +48,5 @@
 
 Discovery::~Discovery(){
+	if (endpoint!=NULL) delete endpoint;
 }
 
Index: source/ariba/overlay/modules/chord/messages/Discovery.h
===================================================================
--- source/ariba/overlay/modules/chord/messages/Discovery.h	(revision 5678)
+++ source/ariba/overlay/modules/chord/messages/Discovery.h	(revision 5679)
@@ -80,5 +80,5 @@
 
 	void setSourceEndpoint( const EndpointDescriptor* endpoint ) {
-		source_endpoint = const_cast<EndpointDescriptor*>(endpoint);
+		source_endpoint = new EndpointDescriptor(*endpoint);
 	}