[svn-commits] file: trunk r60215 - in /trunk: ./ channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: file
Date: Thu Apr  5 07:57:35 2007
New Revision: 60215

URL: http://svn.digium.com/view/asterisk?view=rev&rev=60215
Log:
Merged revisions 60214 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r60214 | file | 2007-04-05 08:55:02 -0400 (Thu, 05 Apr 2007) | 10 lines

Merged revisions 60213 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r60213 | file | 2007-04-05 08:52:50 -0400 (Thu, 05 Apr 2007) | 2 lines

Only unlock our pvt and net locks if we are actually going to try to lock the owner again. (issue #9472 reported by zoa)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=60215&r1=60214&r2=60215
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Thu Apr  5 07:57:35 2007
@@ -15576,7 +15576,8 @@
 		append_history(p, "Rx", "%s / %s / %s", req.data, get_header(&req, "CSeq"), req.rlPart2);
 
 	if (!lockretry) {
-		ast_log(LOG_ERROR, "We could NOT get the channel lock for %s! \n", S_OR(p->owner->name, "- no channel name ??? - "));
+		if (p->owner)
+			ast_log(LOG_ERROR, "We could NOT get the channel lock for %s! \n", S_OR(p->owner->name, "- no channel name ??? - "));
 		ast_log(LOG_ERROR, "SIP transaction failed: %s \n", p->callid);
 		if (req.method != SIP_ACK)
 			transmit_response(p, "503 Server error", &req);	/* We must respond according to RFC 3261 sec 12.2 */