Merged revisions 81401 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81401 | file | 2007-08-30 20:53:41 -0300 (Thu, 30 Aug 2007) | 4 lines

(closes issue #10009)
Reported by: dimas
Don't output a bridge failed warning message if it failed because one of the channels was part of the masquerade process. That is perfectly normal.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81402 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_features.c

@@ -1864,7 +1864,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 			}
 		}
 		if (res < 0) {
-			ast_log(LOG_WARNING, "Bridge failed on channels %s and %s\n", chan->name, peer->name);
+			if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_test_flag(peer, AST_FLAG_ZOMBIE))
+				ast_log(LOG_WARNING, "Bridge failed on channels %s and %s, res = %d\n", chan->name, peer->name, res);
 			return -1;
 		}