Ignore:
Timestamp:
Mar 30, 2012 7:53:36 AM (7 years ago)
Author:
bennylp
Message:

Re #1474: merged r3879:3885

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

    r3938 r4001  
    13611361    int i;  /* Must be signed */ 
    13621362 
     1363    if (pjsua_var.endpt) { 
     1364        PJ_LOG(4,(THIS_FILE, "Shutting down, flags=%d...", flags)); 
     1365    } 
     1366 
    13631367    if (pjsua_var.state > PJSUA_STATE_NULL && 
    13641368        pjsua_var.state < PJSUA_STATE_CLOSING) 
     
    13731377    for (i=0; i<(int)pjsua_var.ua_cfg.thread_cnt; ++i) { 
    13741378        if (pjsua_var.thread[i]) { 
    1375             pj_thread_join(pjsua_var.thread[i]); 
     1379            pj_status_t status; 
     1380            status = pj_thread_join(pjsua_var.thread[i]); 
     1381            if (status != PJ_SUCCESS) { 
     1382                PJ_PERROR(4,(THIS_FILE, status, "Error joining worker thread")); 
     1383                pj_thread_sleep(1000); 
     1384            } 
    13761385            pj_thread_destroy(pjsua_var.thread[i]); 
    13771386            pjsua_var.thread[i] = NULL; 
     
    13811390    if (pjsua_var.endpt) { 
    13821391        unsigned max_wait; 
    1383  
    1384         PJ_LOG(4,(THIS_FILE, "Shutting down, flags=%d...", flags)); 
    13851392 
    13861393        pj_log_push_indent(); 
Note: See TracChangeset for help on using the changeset viewer.