perfsonar development work

Author: roman
Date: 2009-03-13 06:37:41 -0400 (Fri, 13 Mar 2009)
New Revision: 5065

Modified:
   
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/UtilizationResponseGenerator.java
Log:
When valueUnits was not specified in a key then the SetupDataResponse 
returned null pointer exception. Fixed.



Modified: 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/UtilizationResponseGenerator.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/UtilizationResponseGenerator.java
        2009-03-12 17:19:30 UTC (rev 5064)
+++ 
branches/new-structure-with-base2/ps-mdm-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/UtilizationResponseGenerator.java
        2009-03-13 10:37:41 UTC (rev 5065)
@@ -32,9 +32,9 @@
                 datum.setNamespacePrefix("netutil");
 
                 datum.addAttribute("timeValue", 
Long.toString(fetchData.getTimestamp(i + 1)));
-                datum.addAttribute("timeType", 
Double.toString(fetchData.getValue(i, dsNum)));
+                datum.addAttribute("timeType", "unix");
                 datum.addAttribute("value", 
Double.toString(fetchData.getValue(i, dsNum)));
-                datum.addAttribute("valueUnits", valueUnits);
+                if (valueUnits != null) datum.addAttribute("valueUnits", 
valueUnits);
 
                 data.addChild(datum);