fixing issue with job submission commands
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3fbf952f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3fbf952f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3fbf952f Branch: refs/heads/gfac_appcatalog_int Commit: 3fbf952f049ece58457ba6ecdb351e7f1dba84a9 Parents: 9cf6d0d Author: Chathuri Wimalasena <[email protected]> Authored: Tue Nov 4 14:21:09 2014 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Tue Nov 4 14:21:09 2014 -0500 ---------------------------------------------------------------------- .../application/catalog/data/impl/ComputeResourceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/3fbf952f/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 7917b23..3282fc2 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 @@ -776,7 +776,12 @@ public class ComputeResourceImpl implements ComputeResource { Map<String, String> ids = new HashMap<String, String>(); ids.put(AbstractResource.JobManagerCommandConstants.RESOURCE_JOB_MANAGER_ID, resourceJobManagerId); ids.put(AbstractResource.JobManagerCommandConstants.COMMAND_TYPE, commandType.toString()); - JobManagerCommandResource existingCommand = (JobManagerCommandResource)r.get(ids); + JobManagerCommandResource existingCommand; + if (r.isExists(ids)){ + existingCommand = (JobManagerCommandResource)r.get(ids); + }else { + existingCommand = new JobManagerCommandResource(); + } existingCommand.setCommandType(commandType.toString()); existingCommand.setCommand(jobManagerCommands.get(commandType)); existingCommand.setResourceJobManagerId(resource.getResourceJobManagerId());
