make sure unregisterSink works

diff --git a/ambd/core.cpp b/ambd/core.cpp
index 703e35d..0b9669a 100644 (file)
--- 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 (file)
--- 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)