[LON-CAPA-cvs] cvs: loncom(version_2_8_X) /interface domainprefs.pm

[raeburn]

raeburn		Fri Dec 26 16:34:43 2008 EDT

  Modified files:              (Branch: version_2_8_X)
    /loncom/interface	domainprefs.pm 
  Log:
  - Backport 1.82.
  
  
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.76.2.4 loncom/interface/domainprefs.pm:1.76.2.5
--- loncom/interface/domainprefs.pm:1.76.2.4	Thu Dec 25 02:22:08 2008
+++ loncom/interface/domainprefs.pm	Fri Dec 26 16:34:43 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set domain-wide configuration settings
 #
-# $Id: domainprefs.pm,v 1.76.2.4 2008/12/25 02:22:08 raeburn Exp $
+# $Id: domainprefs.pm,v 1.76.2.5 2008/12/26 16:34:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4997,19 +4997,26 @@
             }
             my @currmachines = split(/,/,$currserverstatus{$type}{'machines'});
             my @newmachines = split(/,/,$newserverstatus{$type}{'machines'});
-            foreach my $item (@currmachines) {
-                if (!grep(/^\Q$item\E$/,@newmachines)) {
-                    $changes{$type}{'machines'} = 1;
-                    last;
-                }
-            }
-            foreach my $item (@newmachines) {
-                if (!grep(/^\Q$item\E$/,@currmachines)) {
+            if (@currmachines > 0) {
+                if (@newmachines > 0) {
+                    foreach my $item (@currmachines) {
+                        if (!grep(/^\Q$item\E$/,@newmachines)) {
+                            $changes{$type}{'machines'} = 1;
+                            last;
+                        }
+                    }
+                    foreach my $item (@newmachines) {
+                        if (!grep(/^\Q$item\E$/,@currmachines)) {
+                            $changes{$type}{'machines'} = 1;
+                            last;
+                        }
+                    }
+                } else {
                     $changes{$type}{'machines'} = 1;
-                    last;
                 }
+            } elsif (@newmachines > 0) {
+                $changes{$type}{'machines'} = 1; 
             }
-
         }
     }
     if (keys(%changes) > 0) {