perfsonar development work

Author: roman
Date: 2007-01-31 08:52:49 -0500 (Wed, 31 Jan 2007)
New Revision: 2011

Modified:
   
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:


Catching an exception has been fixed when eventType is missing in metadata 
element but it should be there.


svn merge -r 1951:2010 
https://svn.perfsonar.net/svn/perfsonar/trunk/perfsonar/src/org/perfsonar/service/measurementArchive




Modified: 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
        2007-01-31 13:44:01 UTC (rev 2010)
+++ 
branches/JAVA-SQL-MA-STABLE/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
        2007-01-31 13:52:49 UTC (rev 2011)
@@ -322,8 +322,21 @@
             Map metadataMap = request.getMetadataMap();
             Metadata metadata = (Metadata) 
metadataMap.get(data.getMetadataIdRef());
 
-            _getKey(metadata, null, metadataMap, message, metadataConfig);
+            try {
 
+               _getKey(metadata, null, metadataMap, message, metadataConfig);
+
+            } catch (NullPointerException npex) {
+
+               throw new RequestException(
+                        "error.ma.query",
+                        "RRDTypeMAServiceEngine.getKey: "
+                        + "getting the key is impossible "
+                        + "because of some problem with the format of the 
request; "
+                        + npex.toString());
+
+            }
+
             messageVector.add(message);
 
         }
@@ -583,8 +596,22 @@
             Metadata meta = (Metadata) 
metadataMap.get(data.getMetadataIdRef());
             if (meta == null) continue;
 
-            Key key = getStoreKey(meta);
+            Key key = null;
+            try {
 
+               key = getStoreKey(meta);
+
+            } catch (NullPointerException npex) {
+
+               throw new RequestException(
+                        "error.ma.query",
+                        "RRDTypeMAServiceEngine.storeData: "
+                        + "getting the store key is impossible "
+                        + "because of some problem with the format of the 
request; "
+                        + npex.toString());
+
+            }
+
             Message msg = new Message();
             Metadata md = new Metadata();
             msg.addChild(md);