[svn-commits] russell: trunk r302838 - in /trunk: ./ main/manager.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Jan 19 17:57:27 2011
New Revision: 302838

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

........
  r302837 | russell | 2011-01-19 17:56:48 -0600 (Wed, 19 Jan 2011) | 2 lines
  
  Only check container count if it exists.
........

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

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

Modified: trunk/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager.c?view=diff&rev=302838&r1=302837&r2=302838
==============================================================================
--- trunk/main/manager.c (original)
+++ trunk/main/manager.c Wed Jan 19 17:57:27 2011
@@ -4781,7 +4781,7 @@
 	struct ast_str *buf;
 	int i;
 
-	if (!ao2_container_count(sessions) && AST_RWLIST_EMPTY(&manager_hooks)) {
+	if (!(sessions && ao2_container_count(sessions)) && AST_RWLIST_EMPTY(&manager_hooks)) {
 		return 0;
 	}