[svn-commits] kmoore: branch kmoore/cel_transfers r394104 - in /team/kmoore/cel_transfers: ...

[SVN commits to the Digium repositories]

Author: kmoore
Date: Thu Jul 11 11:25:07 2013
New Revision: 394104

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394104
Log:
Resolve another merge conflict

Modified:
    team/kmoore/cel_transfers/   (props changed)
    team/kmoore/cel_transfers/tests/test_cel.c

Propchange: team/kmoore/cel_transfers/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/kmoore/cel_transfers/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 11 11:25:07 2013
@@ -1,1 +1,1 @@
-/trunk:1-394078
+/trunk:1-394102

Modified: team/kmoore/cel_transfers/tests/test_cel.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/cel_transfers/tests/test_cel.c?view=diff&rev=394104&r1=394103&r2=394104
==============================================================================
--- team/kmoore/cel_transfers/tests/test_cel.c (original)
+++ team/kmoore/cel_transfers/tests/test_cel.c Thu Jul 11 11:25:07 2013
@@ -1868,15 +1868,19 @@
 	ast_event_unsubscribe(event_sub);
 	event_sub = NULL;
 
+	/* cleaned up by RAII_VAR's */
+	cel_expected_events = NULL;
+	cel_received_events = NULL;
+
+	/* check events */
+	ast_test_validate(test, !check_events(local_expected, local_received));
+
 	/* Restore the real CEL config */
 	ast_cel_set_config(saved_config);
 	ao2_cleanup(saved_config);
 	saved_config = NULL;
 
-	/* check events */
-	ast_test_validate(test, !check_events(local_expected, local_received));
-
-	/* get rid of events */
+	/* clean up the locks */
 	ast_mutex_destroy(&sync_lock);
 	ast_cond_destroy(&sync_out);
 	return 0;