perfsonar development work

Author: roman
Date: 2007-08-23 07:42:47 -0400 (Thu, 23 Aug 2007)
New Revision: 2708

Modified:
   
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
Log:

exception handling  improved (when ds or file parameters in the key were 
missing)



Modified: 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
===================================================================
--- 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
       2007-08-23 10:11:10 UTC (rev 2707)
+++ 
branches/new-structure/trunk/geant2_java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/RRDStorageManager.java
       2007-08-23 11:42:47 UTC (rev 2708)
@@ -404,8 +404,20 @@
             }
 
 
-            _file = file.getParameterValue();
-            _dataSource = dataSource.getParameterValue();
+            try {
+                _file = file.getParameterValue();
+            } catch (NullPointerException npex) {
+               throw new PerfSONARException (
+                        "error.ma.query",
+                        "RRDStorageManager.rrdFetch: no file element in the 
key");
+            }
+            try {
+                _dataSource = dataSource.getParameterValue();
+            } catch (NullPointerException npex) {
+               throw new PerfSONARException (
+                        "error.ma.query",
+                        "RRDStorageManager.rrdFetch: no ds element in the 
key");
+            }
 
 
             // ---------------