[asterisk-scf-commits] asterisk-scf/integration/sip.git branch "threading" updated.

[Commits to the Asterisk SCF project code repositories]

branch "threading" has been updated
       via  19dcde2cc6fabcf7abcfcc41a6987169910c70ee (commit)
      from  0aa8e7cbb655426867811936cf679d2add799d33 (commit)

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


- Log -----------------------------------------------------------------
commit 19dcde2cc6fabcf7abcfcc41a6987169910c70ee
Author: Mark Michelson <mmichelson at digium.com>
Date:   Thu May 12 16:43:38 2011 -0500

    I don't even know. I've never even *been* to South Dakota!

diff --git a/src/PJSipSessionModule.cpp b/src/PJSipSessionModule.cpp
index 576f6af..94fe166 100644
--- a/src/PJSipSessionModule.cpp
+++ b/src/PJSipSessionModule.cpp
@@ -649,34 +649,11 @@ public:
         case CalledBack:
             return processRoutingResponse(workListener);
         default:
-            lg(Error) << "We're in a bad state here...and I don't mean South Dakota!";
+            lg(Error) << "We're in a bad state here...";
             return Complete;
         }
     }
 
-    SuspendableWorkResult processRoutingResponse(const SuspendableWorkListenerPtr&)
-    {
-        assert(mAsyncResult);
-        SessionRouterPrx router = SessionRouterPrx::uncheckedCast(mAsyncResult->getProxy());
-        try
-        {
-            router->end_connectBridgedSessions(mAsyncResult);
-        }
-        catch (const std::exception &e)
-        {
-            lg(Debug) << "ConnectBridgedSessionsCallback sending 400 due to exception:  " << e.what();
-            pjsip_dlg_modify_response(mInv->dlg, mTdata, 400, NULL);
-            pjsip_dlg_send_response(mInv->dlg, mTsx, mTdata);
-            return Complete;
-        }
-        pjsip_dlg_send_response(mInv->dlg, mTsx, mTdata);
-        
-        Ice::Current current;
-        lg(Debug) << "ConnectBridgedSessionsCallback calling session->stop(). ";
-        mSession->stop(new ResponseCode(16), current);
-        return Complete;
-    }
-
     SuspendableWorkResult processRefer(const SuspendableWorkListenerPtr& workListener)
     {
         // Determine if this is a blind transfer or an attended transfer
@@ -820,6 +797,29 @@ public:
         }
     };
 
+    SuspendableWorkResult processRoutingResponse(const SuspendableWorkListenerPtr&)
+    {
+        assert(mAsyncResult);
+        SessionRouterPrx router = SessionRouterPrx::uncheckedCast(mAsyncResult->getProxy());
+        try
+        {
+            router->end_connectBridgedSessions(mAsyncResult);
+        }
+        catch (const std::exception &e)
+        {
+            lg(Debug) << "ConnectBridgedSessionsCallback sending 400 due to exception:  " << e.what();
+            pjsip_dlg_modify_response(mInv->dlg, mTdata, 400, NULL);
+            pjsip_dlg_send_response(mInv->dlg, mTsx, mTdata);
+            return Complete;
+        }
+        pjsip_dlg_send_response(mInv->dlg, mTsx, mTdata);
+        
+        Ice::Current current;
+        lg(Debug) << "ConnectBridgedSessionsCallback calling session->stop(). ";
+        mSession->stop(new ResponseCode(16), current);
+        return Complete;
+    }
+
     enum states
     {
         Initial,

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


-- 
asterisk-scf/integration/sip.git