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 2015/01/09 03:22:08 UTC
airavata git commit: post job commands error
Repository: airavata
Updated Branches:
refs/heads/master 8ff835fdd -> 46be45533
post job commands error
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/46be4553
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/46be4553
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/46be4553
Branch: refs/heads/master
Commit: 46be4553388502f81d0604f642673a34bf54cd95
Parents: 8ff835f
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Thu Jan 8 21:22:00 2015 -0500
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Thu Jan 8 21:22:00 2015 -0500
----------------------------------------------------------------------
.../catalog/data/resources/PostJobCommandResource.java | 4 +++-
.../catalog/data/resources/PreJobCommandResource.java | 4 +++-
.../catalog/data/util/AppCatalogThriftConversion.java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/46be4553/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PostJobCommandResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PostJobCommandResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PostJobCommandResource.java
index f832c65..7cde166 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PostJobCommandResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PostJobCommandResource.java
@@ -62,7 +62,9 @@ public class PostJobCommandResource extends AbstractResource {
AppCatalogQueryGenerator generator= new AppCatalogQueryGenerator(POST_JOBCOMMAND);
generator.setParameter(PostJobCommandConstants.DEPLOYMENT_ID,
ids.get(PostJobCommandConstants.DEPLOYMENT_ID));
- generator.setParameter(PostJobCommandConstants.COMMAND, ids.get(PostJobCommandConstants.COMMAND));
+ if (ids.get(PostJobCommandConstants.COMMAND) != null){
+ generator.setParameter(PostJobCommandConstants.COMMAND, ids.get(PostJobCommandConstants.COMMAND));
+ }
Query q = generator.deleteQuery(em);
q.executeUpdate();
em.getTransaction().commit();
http://git-wip-us.apache.org/repos/asf/airavata/blob/46be4553/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PreJobCommandResource.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PreJobCommandResource.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PreJobCommandResource.java
index aee27f5..09a8fa1 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PreJobCommandResource.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/resources/PreJobCommandResource.java
@@ -62,7 +62,9 @@ public class PreJobCommandResource extends AbstractResource {
AppCatalogQueryGenerator generator= new AppCatalogQueryGenerator(PRE_JOBCOMMAND);
generator.setParameter(PreJobCommandConstants.DEPLOYMENT_ID,
ids.get(PreJobCommandConstants.DEPLOYMENT_ID));
- generator.setParameter(PreJobCommandConstants.COMMAND, ids.get(PreJobCommandConstants.COMMAND));
+ if (ids.get(PreJobCommandConstants.COMMAND) != null){
+ generator.setParameter(PreJobCommandConstants.COMMAND, ids.get(PreJobCommandConstants.COMMAND));
+ }
Query q = generator.deleteQuery(em);
q.executeUpdate();
em.getTransaction().commit();
http://git-wip-us.apache.org/repos/asf/airavata/blob/46be4553/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
index df695d1..eaa9eae 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java
@@ -642,7 +642,7 @@ public class AppCatalogThriftConversion {
List<Resource> postJobCommands = postJobCommandResource.get(AbstractResource.PostJobCommandConstants.DEPLOYMENT_ID, resource.getDeploymentId());
if (postJobCommands != null && !postJobCommands.isEmpty()){
for (Resource postjobCommand : postJobCommands){
- description.addToPostJobCommands(((PreJobCommandResource) postjobCommand).getCommand());
+ description.addToPostJobCommands(((PostJobCommandResource) postjobCommand).getCommand());
}
}
return description;