[asterisk-scf-commits] asterisk-scf/release/media_rtp_pjmedia.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  9bc18b0c49e8f0144fa1256aa4aba89ac7b932a4 (commit)
      from  933ffdf5bcb4b74c106c5ac2275b2b1f847a2248 (commit)

Summary of changes:
 src/RTPSession.cpp  |    6 +++---
 test/TestRTPICE.cpp |   10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit 9bc18b0c49e8f0144fa1256aa4aba89ac7b932a4
Author: Brent Eagles <beagles at digium.com>
Date:   Wed Jun 20 17:14:38 2012 -0230

    Fix a servant cleanup issue!

diff --git a/src/RTPSession.cpp b/src/RTPSession.cpp
index 72ecc51..81eb5e8 100644
--- a/src/RTPSession.cpp
+++ b/src/RTPSession.cpp
@@ -1222,8 +1222,8 @@ RTPSessionPrx RTPSessionImpl::activate(
 void RTPSessionImpl::destroy()
 {
     /* Drop the source and sink from the ASM */
-    mAdapter->remove(mStreamSourceProxy->ice_getIdentity());
-    mAdapter->remove(mStreamSinkProxy->ice_getIdentity());
+    mAdapter->removeAllFacets(mStreamSourceProxy->ice_getIdentity());
+    mAdapter->removeAllFacets(mStreamSinkProxy->ice_getIdentity());
 
     if (mTelephonyEventSourcePrx)
     {
@@ -1249,7 +1249,7 @@ void RTPSessionImpl::destroy()
     /* All we have to do is remove ourselves from the ASM, our smart pointerness will cause us to
      * destruct and then cleanup will occur.
      */
-    mAdapter->remove(mAdapter->getCommunicator()->stringToIdentity(mId));
+    mAdapter->removeAllFacets(mAdapter->getCommunicator()->stringToIdentity(mId));
 }
 
 class ReplicationAdapterImpl : public ReplicationAdapter
diff --git a/test/TestRTPICE.cpp b/test/TestRTPICE.cpp
index 45aae7b..a8f0b96 100644
--- a/test/TestRTPICE.cpp
+++ b/test/TestRTPICE.cpp
@@ -89,9 +89,15 @@ public:
 
     ~IceEnvironment()
     {
-        if (mCommunicator)
+        try
+        {
+            if (mCommunicator)
+            {
+                mCommunicator->destroy();
+            }
+        }
+        catch (...)
         {
-            mCommunicator->shutdown();
         }
     }
 

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


-- 
asterisk-scf/release/media_rtp_pjmedia.git