--- projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/CPU__Monitor.java	2001/03/06 22:35:01	1.16
+++ projects/cms/source/server/uk/org/iscream/cms/server/client/monitors/CPU__Monitor.java	2001/03/06 23:44:08	1.17
@@ -11,8 +11,8 @@ import uk.ac.ukc.iscream.componentmanager.*;
 /**
  * This Monitor watches the CPU load for all machines
  *
- * @author  $Author: tdb $
- * @version $Id: CPU__Monitor.java,v 1.16 2001/03/06 22:35:01 tdb Exp $
+ * @author  $Author: ajm $
+ * @version $Id: CPU__Monitor.java,v 1.17 2001/03/06 23:44:08 ajm Exp $
  */
 public class CPU__Monitor extends MonitorSkeleton {
 
@@ -21,7 +21,7 @@ public class CPU__Monitor extends MonitorSkeleton {
     /**
      * The current CVS revision of this class
      */
-    public final String REVISION = "$Revision: 1.16 $";
+    public final String REVISION = "$Revision: 1.17 $";
     
     public final String DESC = "Monitors CPU.";
     
@@ -41,8 +41,9 @@ public class CPU__Monitor extends MonitorSkeleton {
             Register reg = (Register) _hosts.get(source);
             for(int attributeNum = 0; attributeNum < _attributes.length; attributeNum++) {
                 // find out the threshold level we're at
-                String attributeName = _attributes[attributeNum];
-                String currentValue = packet.getParam(attributeName);
+                String attribute = _attributes[attributeNum];
+                String attributeName = _attributeNames[attributeNum];
+                String currentValue = packet.getParam(attribute);
                 int newThreshold = checkAttributeThreshold(currentValue, reg);
                 processAlert(newThreshold, attributeNum, attributeName, reg, source, currentValue);
             }