[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  b02dd548279d4f85369e943c4ea836abf9e14a78 (commit)
      from  bd48b7395d8432e848b12591cde7eba69b25cb49 (commit)

Summary of changes:
 cmake                 |    2 +-
 slice                 |    2 +-
 src/ListenerManager.h |   15 ++++++++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit b02dd548279d4f85369e943c4ea836abf9e14a78
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Sep 28 09:43:52 2010 -0230

    Fixed a TODO where instances of ListenerManagerT were not destroying their
    topics during cleanup.

diff --git a/cmake b/cmake
index 364040a..d30f7d1 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 364040aa2e2252eb07d896dc98eee1d2362f56e9
+Subproject commit d30f7d1a5561c2bf086eacad2e0565c49c261e51
diff --git a/slice b/slice
index 24e811f..36a57a4 160000
--- a/slice
+++ b/slice
@@ -1 +1 @@
-Subproject commit 24e811fa21d491a9a3549ff9192e7b7fc9b83081
+Subproject commit 36a57a423c849ff5688d8c4f3569bf3639feed36
diff --git a/src/ListenerManager.h b/src/ListenerManager.h
index 759fb3f..f1543aa 100644
--- a/src/ListenerManager.h
+++ b/src/ListenerManager.h
@@ -90,8 +90,21 @@ namespace BridgeService
         virtual ~ListenerManagerT()
         {
             //
-            // TODO: Destroy topic.
+            // TODO: 
             //
+            if(mTopic)
+            {
+                try
+                {
+                    mTopic->destroy();
+                }
+                catch(...)
+                {
+                    //
+                    // Destructors are no-throw!
+                    //
+                }
+            }
         }
 
         //

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/bridging.git