svn commit: r1490925 - /airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java

[samindaw]

Author: samindaw
Date: Sat Jun  8 06:43:07 2013
New Revision: 1490925

URL: http://svn.apache.org/r1490925
Log:
converting empty to null

Modified:
    
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java

Modified: 
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
URL: 
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java?rev=1490925&r1=1490924&r2=1490925&view=diff
==============================================================================
--- 
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
 (original)
+++ 
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
 Sat Jun  8 06:43:07 2013
@@ -1804,6 +1804,15 @@ public class ProvenanceRegistryResource 
                                                      
@QueryParam("applicationDescriptionId") String applicationDescriptionId){
         AiravataRegistry2 airavataRegistry = 
RegPoolUtils.acquireRegistry(context);
         try {
+               if (serviceDescriptionId.equals("")){
+                       serviceDescriptionId=null;
+               }
+               if (hostDescriptionId.equals("")){
+                       hostDescriptionId=null;
+               }
+               if (applicationDescriptionId.equals("")){
+                       applicationDescriptionId=null;
+               }
             GFacJobList gFacJobList = new GFacJobList();
             List<ApplicationJob> gFacJobsForDescriptors = 
airavataRegistry.getApplicationJobsForDescriptors(serviceDescriptionId, 
hostDescriptionId, applicationDescriptionId);
             gFacJobList.setJobList(gFacJobsForDescriptors);
@@ -1827,6 +1836,15 @@ public class ProvenanceRegistryResource 
                                        @QueryParam("nodeId") String nodeID){
         AiravataRegistry2 airavataRegistry = 
RegPoolUtils.acquireRegistry(context);
         try {
+               if (experimentID.equals("")){
+                       experimentID=null;
+               }
+               if (workflowInstanceID.equals("")){
+                       workflowInstanceID=null;
+               }
+               if (nodeID.equals("")){
+                       nodeID=null;
+               }
             GFacJobList gFacJobList = new GFacJobList();
             List<ApplicationJob> gFacJobs = 
airavataRegistry.getApplicationJobs(experimentID, workflowInstanceID, nodeID);
             gFacJobList.setJobList(gFacJobs);