You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/07/11 17:29:04 UTC
git commit: checking for NPE for inputs and outputs
Repository: airavata
Updated Branches:
refs/heads/master 1c5b22ac2 -> d8059128e
checking for NPE for inputs and outputs
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d8059128
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d8059128
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d8059128
Branch: refs/heads/master
Commit: d8059128e41b4f3f9984fa0f631d51ef592ba3ff
Parents: 1c5b22a
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Fri Jul 11 11:28:57 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Fri Jul 11 11:28:57 2014 -0400
----------------------------------------------------------------------
.../registry/jpa/impl/ExperimentRegistry.java | 62 ++++++++++++++------
1 file changed, 44 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d8059128/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
index 094329f..f43fd18 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
@@ -266,7 +266,9 @@ public class ExperimentRegistry {
resource.setExperimentResource(experimentResource);
resource.setExperimentKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType().toString());
+ if (input.getType() != null){
+ resource.setInputType(input.getType().toString());
+ }
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -283,7 +285,9 @@ public class ExperimentRegistry {
for (ExperimentInputResource exinput : experimentInputs) {
if (exinput.getExperimentKey().equals(input.getKey())) {
exinput.setValue(input.getValue());
- exinput.setInputType(input.getType().toString());
+ if (input.getType() != null){
+ exinput.setInputType(input.getType().toString());
+ }
exinput.setMetadata(input.getMetaData());
exinput.save();
}
@@ -304,7 +308,9 @@ public class ExperimentRegistry {
resource.setExperimentResource(experiment);
resource.setExperimentKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType().toString());
+ if (output.getType() != null){
+ resource.setOutputType(output.getType().toString());
+ }
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -325,7 +331,9 @@ public class ExperimentRegistry {
resource.setExperimentResource(experiment);
resource.setExperimentKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType().toString());
+ if (output.getType() != null){
+ resource.setOutputType(output.getType().toString());
+ }
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -346,7 +354,9 @@ public class ExperimentRegistry {
resource.setNodeDetailResource(workflowNode);
resource.setOutputKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType().toString());
+ if (output.getType() != null){
+ resource.setOutputType(output.getType().toString());
+ }
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -367,7 +377,9 @@ public class ExperimentRegistry {
resource.setNodeDetailResource(workflowNode);
resource.setOutputKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType().toString());
+ if (output.getType() != null){
+ resource.setOutputType(output.getType().toString());
+ }
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -388,7 +400,9 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetail);
resource.setOutputKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType().toString());
+ if (output.getType() != null){
+ resource.setOutputType(output.getType().toString());
+ }
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -790,7 +804,9 @@ public class ExperimentRegistry {
resource.setNodeDetailResource(nodeDetailResource);
resource.setInputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType().toString());
+ if (input.getType() != null){
+ resource.setInputType(input.getType().toString());
+ }
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -809,7 +825,9 @@ public class ExperimentRegistry {
resource.setNodeDetailResource(nodeDetailResource);
resource.setInputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType().toString());
+ if (input.getType() != null){
+ resource.setInputType(input.getType().toString());
+ }
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -964,7 +982,9 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetailResource);
resource.setInputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType().toString());
+ if (input.getType() != null){
+ resource.setInputType(input.getType().toString());
+ }
resource.setMetadata(input.getMetaData());
resource.save();
}
@@ -975,15 +995,17 @@ public class ExperimentRegistry {
}
- public void addAppOutputs(List<DataObjectType> appInputs, TaskDetailResource taskDetailResource) throws RegistryException {
+ public void addAppOutputs(List<DataObjectType> appOytputs, TaskDetailResource taskDetailResource) throws RegistryException {
try {
- for (DataObjectType input : appInputs) {
+ for (DataObjectType output : appOytputs) {
ApplicationOutputResource resource = (ApplicationOutputResource) taskDetailResource.create(ResourceType.APPLICATION_OUTPUT);
resource.setTaskDetailResource(taskDetailResource);
- resource.setOutputKey(input.getKey());
- resource.setValue(input.getValue());
- resource.setOutputType(input.getType().toString());
- resource.setMetadata(input.getMetaData());
+ resource.setOutputKey(output.getKey());
+ resource.setValue(output.getValue());
+ if (output.getType() != null){
+ resource.setOutputType(output.getType().toString());
+ }
+ resource.setMetadata(output.getMetaData());
resource.save();
}
} catch (Exception e) {
@@ -1004,7 +1026,9 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetail);
resource.setOutputKey(output.getKey());
resource.setValue(output.getValue());
- resource.setOutputType(output.getType().toString());
+ if (output.getType() != null){
+ resource.setOutputType(output.getType().toString());
+ }
resource.setMetadata(output.getMetaData());
resource.save();
}
@@ -1023,7 +1047,9 @@ public class ExperimentRegistry {
resource.setTaskDetailResource(taskDetailResource);
resource.setInputKey(input.getKey());
resource.setValue(input.getValue());
- resource.setInputType(input.getType().toString());
+ if (input.getType() != null){
+ resource.setInputType(input.getType().toString());
+ }
resource.setMetadata(input.getMetaData());
resource.save();
}