[asterisk-commits] file: trunk r50675 - in /trunk: ./ res/res_snmp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Fri Jan 12 21:06:24 2007
New Revision: 50675

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

........
r50674 | file | 2007-01-12 22:04:55 -0500 (Fri, 12 Jan 2007) | 2 lines

Only join the snmp thread on an unload if the thread is actually running. (issue #8810 reported by junky)

........

Modified:
    trunk/   (props changed)
    trunk/res/res_snmp.c

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

Modified: trunk/res/res_snmp.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_snmp.c?view=diff&rev=50675&r1=50674&r2=50675
==============================================================================
--- trunk/res/res_snmp.c (original)
+++ trunk/res/res_snmp.c Fri Jan 12 21:06:24 2007
@@ -106,7 +106,7 @@
 	ast_verbose(VERBOSE_PREFIX_1 "Unloading [Sub]Agent Module\n");
 
 	res_snmp_dont_stop = 0;
-	return pthread_join(thread, NULL);
+	return ((thread != AST_PTHREADT_NULL) ? pthread_join(thread, NULL) : 0);
 }
 
 static int reload(void)