Changeset 3188


Ignore:
Timestamp:
Jun 1, 2010 2:52:18 PM (9 years ago)
Author:
bennylp
Message:

Fix #1090: Disable the "Bug in branch_param generator (i.e. not unique)" assertion. This also fixes the hang problem when building the app in Release mode (assertion disabled), because the transaction is destroyed without being unlocked, causing the subsequent transaction unlock to loop indefinitely.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

    r3138 r3188  
    558558    { 
    559559        pj_mutex_unlock(mod_tsx_layer.mutex); 
    560         PJ_LOG(2,(THIS_FILE, "Unable to register transaction (key exists)")); 
     560        PJ_LOG(2,(THIS_FILE,  
     561                  "Unable to register %.*s transaction (key exists)", 
     562                  (int)tsx->method.name.slen, 
     563                  tsx->method.name.ptr)); 
    561564        return PJ_EEXISTS; 
    562565    } 
     
    12741277    status = pjsip_get_request_dest(tdata, &dst_info); 
    12751278    if (status != PJ_SUCCESS) { 
     1279        unlock_tsx(tsx, &lck); 
    12761280        tsx_destroy(tsx); 
    12771281        return status; 
     
    12821286    status = mod_tsx_layer_register_tsx(tsx); 
    12831287    if (status != PJ_SUCCESS) { 
     1288        /* The assertion is removed by #1090: 
    12841289        pj_assert(!"Bug in branch_param generator (i.e. not unique)"); 
     1290        */ 
     1291        unlock_tsx(tsx, &lck); 
    12851292        tsx_destroy(tsx); 
    12861293        return status; 
Note: See TracChangeset for help on using the changeset viewer.