Index: source/ariba/utility/transport/tcpip/tcpip.cpp
===================================================================
--- source/ariba/utility/transport/tcpip/tcpip.cpp	(revision 5690)
+++ source/ariba/utility/transport/tcpip/tcpip.cpp	(revision 5698)
@@ -190,16 +190,9 @@
 			tcpip_endpoint remote = convert(remote_peer);
 			tcpip_endpoint local  = convert(local_peer);
-
-// DO NOT SET REMOTE PORT!
-//			remote.port() = remote_port;
-//			cout << "received: remote="
-//				 << remote.to_string()
-//               << " local="
-// 				 << local.to_string() << " size=" << message_size << endl;
 			tp.listener->receive_message(
 					&tp, local, remote, datamsg->get_buffer()+6, message_size );
 
-			delete datamsg;
-		}
+		}
+		delete tpmsg;
 	}
 	// clean queue & stop