[asterisk-scf-commits] asterisk-scf/integration/media_rtp_pjmedia.git branch "thread_reduction" updated.

[Commits to the Asterisk SCF project code repositories]

branch "thread_reduction" has been updated
       via  d12e4a2e848fe93d2dbe6275a5fb20a01c4740d0 (commit)
      from  d35deff9771baf9a17cee0cc10ffb1eb286c5d5e (commit)

Summary of changes:
 src/RTPSource.cpp |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit d12e4a2e848fe93d2dbe6275a5fb20a01c4740d0
Author: Brent Eagles <beagles at digium.com>
Date:   Tue Aug 7 14:01:53 2012 -0230

    Fix a bogus code reordering that would cause pjsip code to be called from a
    timer thread before it was registered with pjlib.

diff --git a/src/RTPSource.cpp b/src/RTPSource.cpp
index 2502806..12b8003 100644
--- a/src/RTPSource.cpp
+++ b/src/RTPSource.cpp
@@ -110,13 +110,6 @@ public:
 
     void runTimerTask()
     {
-        if (isShutdown())
-        {
-            mSessionAdapter.reset();
-            mTransport.reset();
-            return;
-        }
-
         if (pj_thread_is_registered() == PJ_FALSE)
         {
             pj_thread_t *thread;
@@ -124,6 +117,13 @@ public:
             pj_status_t status = pj_thread_register("ICE Thread", mThreadDescriptor->mDesc, &thread);
             assert(status == PJ_SUCCESS);
         }
+        
+        if (isShutdown())
+        {
+            mSessionAdapter.reset();
+            mTransport.reset();
+            return;
+        }
 
         void *packet;
         int packet_size;

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


-- 
asterisk-scf/integration/media_rtp_pjmedia.git