Changeset 3188 for pjproject

Timestamp:

Jun 1, 2010 2:52:18 PM (14 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:

• pjproject/trunk/pjsip/src/pjsip/sip_transaction.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_transaction.c

@@ -558 +558 @@
     {
         pj_mutex_unlock(mod_tsx_layer.mutex);
-        PJ_LOG(2,(THIS_FILE, "Unable to register transaction (key exists)"));
+        PJ_LOG(2,(THIS_FILE, 
+                  "Unable to register %.*s transaction (key exists)",
+                  (int)tsx->method.name.slen,
+                  tsx->method.name.ptr));
         return PJ_EEXISTS;
     }
@@ -1274 +1277 @@
     status = pjsip_get_request_dest(tdata, &dst_info);
     if (status != PJ_SUCCESS) {
+        unlock_tsx(tsx, &lck);
         tsx_destroy(tsx);
         return status;
@@ -1282 +1286 @@
     status = mod_tsx_layer_register_tsx(tsx);
     if (status != PJ_SUCCESS) {
+        /* The assertion is removed by #1090:
         pj_assert(!"Bug in branch_param generator (i.e. not unique)");
+        */
+        unlock_tsx(tsx, &lck);
         tsx_destroy(tsx);
         return status;