[asterisk-scf-commits] asterisk-scf/release/sip.git branch "ami" updated.

[Commits to the Asterisk SCF project code repositories]

branch "ami" has been updated
       via  7ef7882aa2d9a601b84d3a8650ad780ce5af7218 (commit)
      from  78967c0c5963c814d5fb059c26c54cf712f22c62 (commit)

Summary of changes:
 src/PJSipSessionModule.cpp |   17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)


- Log -----------------------------------------------------------------
commit 7ef7882aa2d9a601b84d3a8650ad780ce5af7218
Author: Mark Michelson <mmichelson at digium.com>
Date:   Mon Jan 3 10:41:55 2011 -0600

    Don't call stopped() via AMI since it caused deadlocks during testing.

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index d259974..1be5376 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -150,18 +150,6 @@ private:
 
 typedef IceUtil::Handle<ConnectBridgedSessionsWithDestinationCallback> ConnectBridgedSessionsWithDestinationCallbackPtr;
 
-class StoppedCallback : public IceUtil::Shared
-{
-public:
-    StoppedCallback() {}
-    void failure(const Ice::Exception &ex)
-    {
-        lg(Error) << "Ice exception when attempting to relate stopped state: " << ex.what() << std::endl;
-    }
-};
-
-typedef IceUtil::Handle<StoppedCallback> StoppedCallbackPtr;
-
 class RingingCallback : public IceUtil::Shared
 {
 public:
@@ -939,10 +927,7 @@ void PJSipSessionModule::invOnStateChanged(pjsip_inv_session *inv, pjsip_event *
         {
             try
             {
-                StoppedCallbackPtr cb(new StoppedCallback());
-                Callback_SessionListener_stoppedPtr stoppedCB =
-                    newCallback_SessionListener_stopped(cb, &StoppedCallback::failure);
-                (*listener)->begin_stopped(session->getSessionProxy(), response, stoppedCB);
+                (*listener)->stopped(session->getSessionProxy(), response);
             }
             catch (const Ice::Exception &ex)
             {

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


-- 
asterisk-scf/release/sip.git