svn commit: r1394775 - /airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java

[sa...@apache.org]

Author: samindaw
Date: Fri Oct  5 20:01:13 2012
New Revision: 1394775

URL: http://svn.apache.org/viewvc?rev=1394775&view=rev
Log:
null chk for service name and host name when adding/updating application descriptor

Modified:
    airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java

Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1394775&r1=1394774&r2=1394775&view=diff
==============================================================================
--- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original)
+++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Fri Oct  5 20:01:13 2012
@@ -46,6 +46,7 @@ import org.apache.airavata.registry.api.
 import org.apache.airavata.registry.api.exception.UnimplementedRegistryOperationException;
 import org.apache.airavata.registry.api.exception.gateway.DescriptorAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.gateway.DescriptorDoesNotExistsException;
+import org.apache.airavata.registry.api.exception.gateway.InsufficientDataException;
 import org.apache.airavata.registry.api.exception.gateway.MalformedDescriptorException;
 import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowAlreadyExistsException;
 import org.apache.airavata.registry.api.exception.gateway.PublishedWorkflowDoesNotExistsException;
@@ -399,6 +400,9 @@ public class AiravataJPARegistry extends
     }
 
     public void addApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor) throws RegistryException {
+    	if (serviceName==null || hostName==null){
+    		throw new InsufficientDataException("Service name or Host name cannot be null");
+    	}
     	GatewayResource gateway = jpa.getGateway();
         WorkerResource workerResource = jpa.getWorker();
         String applicationName = descriptor.getType().getApplicationName().getStringValue();
@@ -419,6 +423,9 @@ public class AiravataJPARegistry extends
     }
 
     public void updateApplicationDescriptor(String serviceName, String hostName, ApplicationDeploymentDescription descriptor) throws RegistryException {
+    	if (serviceName==null || hostName==null){
+    		throw new InsufficientDataException("Service name or Host name cannot be null");
+    	}
     	GatewayResource gateway = jpa.getGateway();
     	String applicationName = descriptor.getType().getApplicationName().getStringValue();
         applicationName = createAppName(serviceName, hostName, applicationName);
@@ -440,6 +447,9 @@ public class AiravataJPARegistry extends
 	}
     
     public ApplicationDeploymentDescription getApplicationDescriptor(String serviceName, String hostname, String applicationName)throws DescriptorDoesNotExistsException, MalformedDescriptorException, RegistryException{
+    	if (serviceName==null || hostname==null){
+    		throw new InsufficientDataException("Service name or Host name cannot be null");
+    	}
     	GatewayResource gateway = jpa.getGateway();
 		if (!isApplicationDescriptorExists(serviceName,hostname,applicationName)){
         	throw new DescriptorDoesNotExistsException(createAppName(serviceName, hostname, applicationName));