Repository: airavata Updated Branches: refs/heads/master 596a1e995 -> 0eabb9372
Fix updating of Experiment and Task status. AIRAVATA-1164 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0eabb937 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0eabb937 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0eabb937 Branch: refs/heads/master Commit: 0eabb937288c9c8341d80405d132feca777fc335 Parents: 596a1e9 Author: raminder <[email protected]> Authored: Thu May 1 12:00:24 2014 -0400 Committer: raminder <[email protected]> Committed: Thu May 1 12:00:24 2014 -0400 ---------------------------------------------------------------------- .../persistance/registry/jpa/impl/ExperimentRegistry.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0eabb937/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 9a1906c..3898418 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 @@ -650,8 +650,12 @@ public class ExperimentRegistry { TaskDetailResource taskDetail = (TaskDetailResource) workflowNode.create(ResourceType.TASK_DETAIL); DataTransferDetailResource dataTransferDetail = taskDetail.getDataTransferDetail(transferId); StatusResource statusResource = dataTransferDetail.getDataTransferStatus(); - statusResource.setExperimentResource(dataTransferDetail.getTaskDetailResource().getWorkflowNodeDetailResource().getExperimentResource()); - statusResource.setWorkflowNodeDetail(dataTransferDetail.getTaskDetailResource().getWorkflowNodeDetailResource()); + + WorkflowNodeDetailResource workflowNodeDetailResource = dataTransferDetail.getTaskDetailResource().getWorkflowNodeDetailResource(); + if(workflowNodeDetailResource != null){ + statusResource.setExperimentResource(workflowNodeDetailResource.getExperimentResource()); + statusResource.setWorkflowNodeDetail(workflowNodeDetailResource); + } statusResource.setTaskDetailResource(dataTransferDetail.getTaskDetailResource()); statusResource.setDataTransferDetail(dataTransferDetail); statusResource.setStatusType(StatusType.DATA_TRANSFER.toString());
