[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r336097 - in /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Thu Sep 15 11:03:56 2011
New Revision: 336097

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=336097
Log:
Merged revisions 336042,336091,336094 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336042 | oej | 2011-09-15 14:46:38 +0200 (Thu, 15 Sep 2011) | 12 lines
  
  Meetme: Introducing a new option "k" to kill a conference if there's only a single member left.
  
  When using Meetme as a modular call bridge from third party applications, it's handy to make
  it behave like a normal call bridge. When the second to last person exists, the last person
  will be kicked out of the conference when this option is enabled.
  
  (closes issue ASTERISK-18234)
  
  Review: https://reviewboard.asterisk.org/r/1376/
  
  Patch by oej, sponsored by ClearIT, Solna, Sweden
................
  r336091 | dvossel | 2011-09-15 17:19:10 +0200 (Thu, 15 Sep 2011) | 2 lines
  
  Removes some no-op code found in format_cap.c.
................
  r336094 | irroot | 2011-09-15 17:54:46 +0200 (Thu, 15 Sep 2011) | 26 lines
  
  Merged revisions 336093 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336093 | irroot | 2011-09-15 17:46:21 +0200 (Thu, 15 Sep 2011) | 20 lines
    
    
    Locking order in app_queue.c causes deadlocks.
    
    a channel lock must never be held with the queues container lock held.
    
    the deadlock occured on masquerade.
    
    the queues container lock is a relic of the past the old queue module lock.
    with ao2 there is no need to hold this lock when dealing with members this
    patch removes unneeded locks.
    
    (closes issue ASTERISK-18101)
    (closes issue ASTERISK-18487)
    Reported by: Paul Rolfe, Jason Legault
    Tested by: irroot, Jason Legault, Paul Rolfe
    Reviewed by: Matthew Nicholson
    
    Review: https://reviewboard.asterisk.org/r/1402/
  ........
................

Modified:
    team/irroot/distrotech-customers-10/   (props changed)
    team/irroot/distrotech-customers-10/apps/app_queue.c
    team/irroot/distrotech-customers-10/main/format_cap.c

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 15 11:03:56 2011
@@ -1,1 +1,1 @@
-/branches/10:1-336056
+/branches/10:1-336094

Modified: team/irroot/distrotech-customers-10/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/apps/app_queue.c?view=diff&rev=336097&r1=336096&r2=336097
==============================================================================
--- team/irroot/distrotech-customers-10/apps/app_queue.c (original)
+++ team/irroot/distrotech-customers-10/apps/app_queue.c Thu Sep 15 11:03:56 2011
@@ -6996,9 +6996,6 @@
 		return -1;
 	}
 
-	/* We've made it here, so it looks like we're doing operations on all queues. */
-	ao2_lock(queues);
-
 	/* Mark all queues as dead for the moment if we're reloading queues.
 	 * For clarity, we could just be reloading members, in which case we don't want to mess
 	 * with the other queue parameters at all*/
@@ -7022,7 +7019,6 @@
 	if (queue_reload) {
 		ao2_callback(queues, OBJ_NODATA | OBJ_MULTIPLE | OBJ_UNLINK | OBJ_NOLOCK, kill_dead_queues, (char *) queuename);
 	}
-	ao2_unlock(queues);
 	return 0;
 }
 

Modified: team/irroot/distrotech-customers-10/main/format_cap.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/main/format_cap.c?view=diff&rev=336097&r1=336096&r2=336097
==============================================================================
--- team/irroot/distrotech-customers-10/main/format_cap.c (original)
+++ team/irroot/distrotech-customers-10/main/format_cap.c Thu Sep 15 11:03:56 2011
@@ -521,8 +521,6 @@
 	}
 	result = ast_format_cap_destroy(result);
 
-	/* Remember to always free the NULL before returning it. */
-	ast_free(NULL);
 	return NULL;
 }