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/07 22:02:50 UTC
git commit: bull chk
Repository: airavata
Updated Branches:
refs/heads/master f96ff8903 -> 0b8817370
bull chk
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0b881737
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0b881737
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0b881737
Branch: refs/heads/master
Commit: 0b881737067eeb2bf7a6226e4755e1e4a28eaaf4
Parents: f96ff89
Author: Saminda Wijeratne <sa...@gmail.com>
Authored: Mon Jul 7 16:02:32 2014 -0400
Committer: Saminda Wijeratne <sa...@gmail.com>
Committed: Mon Jul 7 16:02:32 2014 -0400
----------------------------------------------------------------------
.../catalog/data/impl/ComputeResourceImpl.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0b881737/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
index e092071..e23caae 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
@@ -645,12 +645,14 @@ public class ComputeResourceImpl implements ComputeResource {
ResourceJobManagerResource resource = AppCatalogThriftConversion.getResourceJobManager(resourceJobManager);
resource.save();
Map<JobManagerCommand, String> jobManagerCommands = resourceJobManager.getJobManagerCommands();
- for (JobManagerCommand commandType : jobManagerCommands.keySet()) {
- JobManagerCommandResource r = new JobManagerCommandResource();
- r.setCommandType(commandType.toString());
- r.setCommand(jobManagerCommands.get(commandType));
- r.setResourceJobManagerId(resource.getResourceJobManagerId());
- r.save();
+ if (jobManagerCommands!=null) {
+ for (JobManagerCommand commandType : jobManagerCommands.keySet()) {
+ JobManagerCommandResource r = new JobManagerCommandResource();
+ r.setCommandType(commandType.toString());
+ r.setCommand(jobManagerCommands.get(commandType));
+ r.setResourceJobManagerId(resource.getResourceJobManagerId());
+ r.save();
+ }
}
return resource.getResourceJobManagerId();
}