perfsonar development work

Author: roman
Date: 2007-08-22 06:32:48 -0400 (Wed, 22 Aug 2007)
New Revision: 2700

Modified:
   
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
   
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
   
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
Log:

exception handling  improved (when interface or subject element is missing in 
request metadata)




Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
        2007-08-22 10:16:25 UTC (rev 2699)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/DiscardsQueryGenerator.java
        2007-08-22 10:32:48 UTC (rev 2700)
@@ -119,7 +119,17 @@
                 authRealm      = (interf.getAuthRealmElement()      != null 
? interf.getAuthRealmElement().getAuthRealm().trim()           : "");
                 classOfService = (interf.getClassOfServiceElement() != null 
? interf.getClassOfServiceElement().getClassOfService().trim() : "");
                 capacity       = (interf.getCapacityElement()       != null 
? interf.getCapacityElement().getCapacity().trim()             : "");
+            } else {
+               throw new PerfSONARException(
+                        "error.ma.query",
+                        "DiscardsQueryGenerator.getMetadataQuery: "
+                        + "no interface element in metadata element");
             }
+        } else {
+               throw new PerfSONARException(
+                    "error.ma.query",
+                    "DiscardsQueryGenerator.getMetadataQuery: "
+                    + "no subject element in metadata element");
         }
 
 

Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
  2007-08-22 10:16:25 UTC (rev 2699)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/ErrorsQueryGenerator.java
  2007-08-22 10:32:48 UTC (rev 2700)
@@ -119,7 +119,17 @@
                 authRealm      = (interf.getAuthRealmElement()      != null 
? interf.getAuthRealmElement().getAuthRealm().trim()           : "");
                 classOfService = (interf.getClassOfServiceElement() != null 
? interf.getClassOfServiceElement().getClassOfService().trim() : "");
                 capacity       = (interf.getCapacityElement()       != null 
? interf.getCapacityElement().getCapacity().trim()             : "");
+            } else {
+               throw new PerfSONARException(
+                        "error.ma.query",
+                        "ErrorsQueryGenerator.getMetadataQuery: "
+                        + "no interface element in metadata element");
             }
+        } else {
+               throw new PerfSONARException(
+                    "error.ma.query",
+                    "ErrorsQueryGenerator.getMetadataQuery: "
+                    + "no subject element in metadata element");
         }
 
 

Modified: 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
===================================================================
--- 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
     2007-08-22 10:16:25 UTC (rev 2699)
+++ 
branches/new-structure/trunk/perfsonar_base/src/main/java/org/perfsonar/service/measurementArchive/metadataConfig/queryGenerator/UtilizationQueryGenerator.java
     2007-08-22 10:32:48 UTC (rev 2700)
@@ -119,7 +119,17 @@
                 authRealm      = (interf.getAuthRealmElement()      != null 
? interf.getAuthRealmElement().getAuthRealm().trim()           : "");
                 classOfService = (interf.getClassOfServiceElement() != null 
? interf.getClassOfServiceElement().getClassOfService().trim() : "");
                 capacity       = (interf.getCapacityElement()       != null 
? interf.getCapacityElement().getCapacity().trim()             : "");
+            } else {
+               throw new PerfSONARException(
+                        "error.ma.query",
+                        "UtilizationQueryGenerator.getMetadataQuery: "
+                        + "no interface element in metadata element");
             }
+        } else {
+               throw new PerfSONARException(
+                    "error.ma.query",
+                    "UtilizationQueryGenerator.getMetadataQuery: "
+                    + "no subject element in metadata element");
         }