Index: /source/ariba/communication/BaseCommunication.cpp
===================================================================
--- /source/ariba/communication/BaseCommunication.cpp	(revision 2801)
+++ /source/ariba/communication/BaseCommunication.cpp	(revision 2802)
@@ -490,4 +490,18 @@
 		}
 
+		//
+		// delete all pending messages for the link that has been closed
+		//
+
+		BOOST_FOREACH( Message* msg, linkDesc.waitingmsg ){
+			delete msg;
+		}
+
+		linkDesc.waitingmsg.clear();
+
+		//
+		// remove the link descriptor
+		//
+
 		removeLink( localLink );
 
