You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/11 18:31:04 UTC
[1/2] git commit: fixing the intermediate experiment status null issue
Repository: airavata
Updated Branches:
refs/heads/master c3ca7af33 -> f21be5526
fixing the intermediate experiment status null issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d813b8b1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d813b8b1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d813b8b1
Branch: refs/heads/master
Commit: d813b8b1bba5f64c0b23795cefcb6d32a10abb84
Parents: c37054b
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Fri Jul 11 12:30:30 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Fri Jul 11 12:30:30 2014 -0400
----------------------------------------------------------------------
.../persistance/registry/jpa/impl/ExperimentRegistry.java | 2 +-
.../registry/jpa/resources/WorkflowNodeDetailResource.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d813b8b1/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..60d8aaa 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
@@ -496,7 +496,7 @@ public class ExperimentRegistry {
TaskDetailResource taskDetail = workflowNode.getTaskDetail(taskId);
StatusResource statusResource;
if (taskDetail.isTaskStatusExist(taskId)){
- statusResource = workflowNode.getTaskStatus(taskId);
+ statusResource = taskDetail.getWorkflowNodeDetailResource().getTaskStatus(taskId);
} else {
statusResource = (StatusResource)taskDetail.create(ResourceType.STATUS);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/d813b8b1/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
index 9c05b17..3d96f45 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/WorkflowNodeDetailResource.java
@@ -423,9 +423,8 @@ public class WorkflowNodeDetailResource extends AbstractResource {
if (taskStatus.getState() == null || taskStatus.getState().equals("") ){
taskStatus.setState("UNKNOWN");
}
-
+ return taskStatus;
}
- return taskStatus;
}
return null;
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by sa...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f21be552
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f21be552
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f21be552
Branch: refs/heads/master
Commit: f21be5526b12dc80b18da22d169b90752e36ba66
Parents: d813b8b c3ca7af
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Fri Jul 11 12:30:45 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Fri Jul 11 12:30:45 2014 -0400
----------------------------------------------------------------------
.../monitor/impl/pull/qstat/HPCPullMonitor.java | 10 ++++
.../registry/jpa/impl/ExperimentRegistry.java | 62 ++++++++++++++------
.../jpa/utils/ThriftDataModelConversion.java | 24 ++++++--
.../gsi/ssh/impl/StandardOutReader.java | 6 ++
4 files changed, 78 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f21be552/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/ExperimentRegistry.java
----------------------------------------------------------------------