[asterisk-commits] jpeeler: trunk r307274 - in /trunk: ./ main/astobj2.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed Feb  9 15:08:22 2011
New Revision: 307274

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=307274
Log:
Merged revisions 307273 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r307273 | jpeeler | 2011-02-09 15:06:33 -0600 (Wed, 09 Feb 2011) | 8 lines
  
  Add missing debug info for ao2_link for use with REF_DEBUG in ao2 callback.
  
  (closes issue #18758)
  Reported by: rgagnon
  Patches: 
        branch-1.8-r306540-astobj-fix.diff uploaded by rgagnon (license 1202)
        trunk-r306540-astobj-fix.diff uploaded by rgagnon (license 1202)
........

Modified:
    trunk/   (props changed)
    trunk/main/astobj2.c

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

Modified: trunk/main/astobj2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/astobj2.c?view=diff&rev=307274&r1=307273&r2=307274
==============================================================================
--- trunk/main/astobj2.c (original)
+++ trunk/main/astobj2.c Wed Feb  9 15:08:22 2011
@@ -705,7 +705,11 @@
 			 * link the object into the container that will hold the results.
 			 */
 			if (ret && (multi_container != NULL)) {
-				__ao2_link(multi_container, ret, flags);
+				if (tag) {
+					__ao2_link_debug(multi_container, ret, flags, tag, file, line, funcname);
+				} else {
+					__ao2_link(multi_container, ret, flags);
+				}
 				ret = NULL;
 			}