[svn-commits] seanbright: branch 1.6.1 r252625 - in /branches/1.6.1: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Mon Mar 15 16:59:40 2010
New Revision: 252625

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=252625
Log:
Merged revisions 252623 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252623 | seanbright | 2010-03-15 17:55:44 -0400 (Mon, 15 Mar 2010) | 4 lines
  
  Resolve a crash in SLATrunk when the specified trunk doesn't exist.
  
  Reported by philipp64 in #asterisk-dev.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_meetme.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_meetme.c?view=diff&rev=252625&r1=252624&r2=252625
==============================================================================
--- branches/1.6.1/apps/app_meetme.c (original)
+++ branches/1.6.1/apps/app_meetme.c Mon Mar 15 16:59:40 2010
@@ -5299,7 +5299,6 @@
 	if (!trunk) {
 		ast_log(LOG_ERROR, "SLA Trunk '%s' not found!\n", args.trunk_name);
 		pbx_builtin_setvar_helper(chan, "SLATRUNK_STATUS", "FAILURE");
-		ast_atomic_fetchadd_int((int *) &trunk->ref_count, -1);
 		sla_queue_event(SLA_EVENT_CHECK_RELOAD);	
 		return 0;
 	}