[svn-commits] russell: trunk r255410 - in /trunk: ./ channels/chan_h323.c

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Mar 30 15:56:26 2010
New Revision: 255410

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

........
  r255409 | russell | 2010-03-30 15:56:00 -0500 (Tue, 30 Mar 2010) | 2 lines
  
  Don't kill Asterisk if the H323 listener does not start.
........

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

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

Modified: trunk/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_h323.c?view=diff&rev=255410&r1=255409&r2=255410
==============================================================================
--- trunk/channels/chan_h323.c (original)
+++ trunk/channels/chan_h323.c Tue Mar 30 15:56:26 2010
@@ -3305,7 +3305,7 @@
 			ASTOBJ_CONTAINER_DESTROYALL(&aliasl, oh323_destroy_alias);
 			ASTOBJ_CONTAINER_DESTROY(&aliasl);
 
-			return AST_MODULE_LOAD_FAILURE;
+			return AST_MODULE_LOAD_DECLINE;
 		}
 		/* Possibly register with a GK */
 		if (!gatekeeper_disable) {