From c9ac734ae94703eb1cc5f70fa8150168166a180d Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 27 Jun 2007 16:12:25 +0000
Subject: [PATCH] - user web: host merge: skip disjoint-time check     if one
 of the hosts has zero credit

html/inc/
    host.inc

svn path=/trunk/boinc/; revision=13035
---
 checkin_notes     | 7 +++++++
 html/inc/host.inc | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index bacd9a4824..66aaa669e6 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -6774,3 +6774,10 @@ Charlie 27 June 2007
         app_start.C
     lib/
         shmem.C
+
+David  27 June 2007
+    - user web: host merge: skip disjoint-time check
+        if one of the hosts has zero credit
+
+    html/inc/
+        host.inc
diff --git a/html/inc/host.inc b/html/inc/host.inc
index da3576eaa2..6315742f31 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -310,7 +310,11 @@ function times_disjoint($host1, $host2) {
 // So the CPU/OS checks don't have to be very strict.
 //
 function hosts_compatible($host1, $host2) {
-    if (!times_disjoint($host1, $host2)) return false;
+    // skip disjoint-time check if one host or other has no credit
+    //
+    if ($host1->total_credit && $host->total_credit) {
+        if (!times_disjoint($host1, $host2)) return false;
+    }
     if ($host2->os_name != $host1->os_name) return false;
     if (!cpus_compatible($host1, $host2)) return false;
     return true;