From 4a99aae9e464f5a9a2b3c3832ee5605010c96084 Mon Sep 17 00:00:00 2001
From: Dario Casalinuovo <b.vitruvio@gmail.com>
Date: Fri, 24 Jul 2015 01:21:54 +0200
Subject: [PATCH] media_server: Check BMessenger validity

* Check BMessenger::IsValid on the instance
  used to query the nodes so that crashed
  teams are identified as soon as possible.
---
 src/servers/media/AppManager.cpp | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/servers/media/AppManager.cpp b/src/servers/media/AppManager.cpp
index 589dabd0ba..e998f7cec2 100644
--- a/src/servers/media/AppManager.cpp
+++ b/src/servers/media/AppManager.cpp
@@ -192,8 +192,6 @@ void
 AppManager::_BigBrother()
 {
 	status_t status = B_TIMED_OUT;
-	BMessage ping('PING');
-	BMessage reply;
 
 	do {
 		if (!Lock())
@@ -202,21 +200,29 @@ AppManager::_BigBrother()
 		bool startOver = false;
 		AppMap::iterator iterator = fMap.begin();
 		for (; iterator != fMap.end(); iterator++) {
-			reply.what = 0;
-			status = iterator->second.SendMessage(&ping, &reply, 5000000,
-				2000000);
-			if (status != B_OK || reply.what != 'PONG') {
-				team_id team = iterator->first;
-				Unlock();
-
-				_TeamDied(team);
+			// No need to send the alive message
+			// if the team died.
+			if (iterator->second.IsValid() == true) {
+				BMessage ping('PING');
+				BMessage reply;
+				reply.what = 0;
+				status = iterator->second.SendMessage(&ping, &reply, 5000000,
+					2000000);
+				if (status != B_OK || reply.what != 'PONG') {
+					startOver = true;
+					break;
+				}
+			} else {
 				startOver = true;
 				break;
 			}
 		}
 
-		if (startOver)
+		if (startOver == true) {
+			Unlock();
+			_TeamDied(iterator->first);
 			continue;
+		}
 
 		Unlock();
 		status = acquire_sem_etc(fQuit, 1, B_RELATIVE_TIMEOUT, 2000000);