summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 23:58:30 +0000
committersimonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-22 23:58:30 +0000
commit72342ae252520b03772a5ea0e529698b0b6d5518 (patch)
treee9d898855bda1ae0efff9f1c875fab28ca3e8a3f /remoting
parentd8b3c89acf572a7be1776e972af01a6bb183a477 (diff)
downloadchromium_src-72342ae252520b03772a5ea0e529698b0b6d5518.zip
chromium_src-72342ae252520b03772a5ea0e529698b0b6d5518.tar.gz
chromium_src-72342ae252520b03772a5ea0e529698b0b6d5518.tar.bz2
[Chromoting] Let the webapp handle a host with no JID correctly.
BUG=119543 Review URL: https://chromiumcodereview.appspot.com/9838019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/webapp/host_list.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/webapp/host_list.js b/remoting/webapp/host_list.js
index e7d813c..c7df0bb 100644
--- a/remoting/webapp/host_list.js
+++ b/remoting/webapp/host_list.js
@@ -187,8 +187,8 @@ remoting.HostList.prototype.display = function() {
/** @type {remoting.Host} */
var host = this.hosts_[i];
// Validate the entry to make sure it has all the fields we expect.
- if (host.hostName && host.hostId && host.status && host.jabberId &&
- host.publicKey) {
+ // If the host has never sent a heartbeat, then there will be no jabberId.
+ if (host.hostName && host.hostId && host.status && host.publicKey) {
var hostTableEntry = new remoting.HostTableEntry();
hostTableEntry.init(host, onRename, onDelete);
this.hostTableEntries_[i] = hostTableEntry;