perfsonar development work

Author: roman
Date: 2006-06-27 06:45:17 -0400 (Tue, 27 Jun 2006)
New Revision: 1333

Modified:
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/RRDConfigurationStorageManager.java
   
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
Log:
- exception handling in case of the xml database is down
- bug related with writing measurement data into rrd files (after merging 
with 'result codes') fixed

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/RRDConfigurationStorageManager.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/RRDConfigurationStorageManager.java
  2006-06-26 15:57:03 UTC (rev 1332)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdStorageManager/RRDConfigurationStorageManager.java
  2006-06-27 10:45:17 UTC (rev 1333)
@@ -126,11 +126,24 @@
         if (query.trim() == "")
             throw new SystemException(
                     "error.ma.query",
-                    "Empty query to get data from rrd metadata configuration 
file");
+                    "RRDConfigurationStorageManager.fetch: "
+                    + "Empty query to get data from rrd metadata 
configuration file");
 
 
-        Object object = this.existDbXmlStorageManager.fetch(query);
+        Object object = null;
+        try {
+               object = this.existDbXmlStorageManager.fetch(query);
+        } catch (Exception ex) {
+               throw new SystemException(
+                               "error.common.storage.xmldb",
+                               "Connection to xml database failed");
+        }
         String[] xmlResults = (String[]) object;
+        if (xmlResults == null)
+               throw new SystemException(
+                               "error.ma",
+                               "RRDConfigurationStorageManager.fetch: "
+                               + "Result array of metadata search in null"); 
 
 
         logger.debug("RRDConfigurationStorageManager.fetch: "

Modified: 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
===================================================================
--- 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-06-26 15:57:03 UTC (rev 1332)
+++ 
trunk/perfsonar/src/org/perfsonar/service/measurementArchive/rrdType/RRDTypeMAServiceEngine.java
    2006-06-27 10:45:17 UTC (rev 1333)
@@ -567,7 +567,32 @@
 
             Message query = new Message();
             query.addChild(metadata);
-            Message resp = config.fetch(query);
+            
+            Message resp = null;
+            try {
+               resp = config.fetch(query);
+            } catch (SystemException sex) {
+               if 
(sex.getResultCode().equals("warning.ma.metadata_configuration"))
+                       resp = new Message();
+               else
+                       throw new SystemException(
+                                       sex.getResultCode(),
+                                       sex.getResultDescription());
+            } catch (RequestException rex) {
+               throw new RequestException(
+                               rex.getResultCode(),
+                               rex.getResultDescription());
+            } catch (DataFormatException dfex) {
+               throw new DataFormatException(
+                               dfex.getResultCode(),
+                               dfex.getResultDescription());
+            } catch (Exception ex) {
+               throw new SystemException(
+                               "uknown",
+                               "RRDTypeMAServiceEngine.getStoreKey: "
+                               + "Something wrong has happened during 
fetching data "
+                               + "from metadata configuration storage");
+            }
 
 
             if (resp.getDataMap().size() > 0) {