Changeset 4001 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

Timestamp:

Mar 30, 2012 7:53:36 AM (12 years ago)

Author:

bennylp

Message:

Re #1474: merged r3879:3885

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -1361 +1361 @@
     int i;  /* Must be signed */
 
+    if (pjsua_var.endpt) {
+        PJ_LOG(4,(THIS_FILE, "Shutting down, flags=%d...", flags));
+    }
+
     if (pjsua_var.state > PJSUA_STATE_NULL &&
         pjsua_var.state < PJSUA_STATE_CLOSING)
@@ -1373 +1377 @@
     for (i=0; i<(int)pjsua_var.ua_cfg.thread_cnt; ++i) {
         if (pjsua_var.thread[i]) {
-            pj_thread_join(pjsua_var.thread[i]);
+            pj_status_t status;
+            status = pj_thread_join(pjsua_var.thread[i]);
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(4,(THIS_FILE, status, "Error joining worker thread"));
+                pj_thread_sleep(1000);
+            }
             pj_thread_destroy(pjsua_var.thread[i]);
             pjsua_var.thread[i] = NULL;
@@ -1381 +1390 @@
     if (pjsua_var.endpt) {
         unsigned max_wait;
-
-        PJ_LOG(4,(THIS_FILE, "Shutting down, flags=%d...", flags));
 
         pj_log_push_indent();