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/03/12 22:06:25 UTC
git commit: saving default error details enums
Repository: airavata
Updated Branches:
refs/heads/master 0b6de0611 -> 05de4b430
saving default error details enums
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/05de4b43
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/05de4b43
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/05de4b43
Branch: refs/heads/master
Commit: 05de4b430b14e3dcfdfcfe1b91f7f2f5bf892731
Parents: 0b6de06
Author: chathuri <ch...@apache.org>
Authored: Wed Mar 12 17:06:16 2014 -0400
Committer: chathuri <ch...@apache.org>
Committed: Wed Mar 12 17:06:16 2014 -0400
----------------------------------------------------------------------
.../persistance/registry/jpa/impl/ExperimentRegistry.java | 4 ++++
.../persistance/registry/jpa/resources/QosParamResource.java | 8 +++++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/05de4b43/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 85f97b6..f5b397a 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
@@ -1301,9 +1301,13 @@ public class ExperimentRegistry {
errorResource.setTransientPersistent(error.isTransientOrPersistent());
if (error.getCorrectiveAction() != null){
errorResource.setCorrectiveAction(error.getCorrectiveAction().toString());
+ }else {
+ errorResource.setCorrectiveAction(CorrectiveAction.CONTACT_SUPPORT.toString());
}
if (error.getActionableGroup() != null){
errorResource.setActionableGroup(error.getActionableGroup().toString());
+ }else {
+ errorResource.setActionableGroup(ActionableGroup.GATEWAYS_ADMINS.toString());
}
errorResource.save();
return String.valueOf(errorResource.getErrorId());
http://git-wip-us.apache.org/repos/asf/airavata/blob/05de4b43/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/QosParamResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/QosParamResource.java b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/QosParamResource.java
index 3a89e4e..eaef63f 100644
--- a/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/QosParamResource.java
+++ b/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/resources/QosParamResource.java
@@ -120,11 +120,13 @@ public class QosParamResource extends AbstractResource {
em.getTransaction().begin();
QosParam qosParam = new QosParam();
Experiment experiment = em.find(Experiment.class, experimentResource.getExpID());
- TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId());
+ if (taskDetailResource != null){
+ TaskDetail taskDetail = em.find(TaskDetail.class, taskDetailResource.getTaskId());
+ qosParam.setTaskId(taskDetailResource.getTaskId());
+ qosParam.setTask(taskDetail);
+ }
qosParam.setExpId(experimentResource.getExpID());
qosParam.setExperiment(experiment);
- qosParam.setTaskId(taskDetailResource.getTaskId());
- qosParam.setTask(taskDetail);
qosParam.setStartExecutionAt(startExecutionAt);
qosParam.setExecuteBefore(executeBefore);
qosParam.setNoOfRetries(noOfRetries);