From: Kevron Rees <tripzero.kev@gmail.com>
Date: Sat, 4 May 2013 19:47:37 +0000 (-0700)
Subject: make sure unregisterSink works
X-Git-Tag: 0.10.800~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0dbf099cfc85e85e8ffe1d35af2c74749299eb7b;p=profile%2Fivi%2Fautomotive-message-broker.git

make sure unregisterSink works
---

diff --git a/ambd/core.cpp b/ambd/core.cpp
index 703e35d..0b9669a 100644
--- a/ambd/core.cpp
+++ b/ambd/core.cpp
@@ -50,10 +50,16 @@ Core::Core()
 
 Core::~Core()
 {
+	std::vector<AbstractSink*> toDelete;
 	for(auto itr = mSinks.begin(); itr != mSinks.end(); itr++)
 	{
 		AbstractSink* sink = *itr;
-		delete sink;
+		toDelete.push_back(sink);
+	}
+
+	for(int i=0; i<toDelete.size(); i++)
+	{
+		delete toDelete[i];
 	}
 }
 
diff --git a/lib/abstractsink.cpp b/lib/abstractsink.cpp
index 82de77f..a8ec558 100644
--- a/lib/abstractsink.cpp
+++ b/lib/abstractsink.cpp
@@ -28,7 +28,7 @@ AbstractSink::AbstractSink(AbstractRoutingEngine* engine, map<string, string> co
 
 AbstractSink::~AbstractSink()
 {
-	//routingEngine->unregisterSink(this);
+	routingEngine->unregisterSink(this);
 }
 
 void AbstractSink::setConfiguration(map<string, string> config)