Repository: airavata Updated Branches: refs/heads/develop 2e7fb05b4 -> 3fa3c3f63
fixing AIRAVATA-1517 : When there are no JobManager Commands, Empty records get created upon updating Job Submission Protocols Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3fa3c3f6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3fa3c3f6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3fa3c3f6 Branch: refs/heads/develop Commit: 3fa3c3f638dcdcf2c34e45c63ba52443f53be640 Parents: 2e7fb05 Author: scnakandala <[email protected]> Authored: Thu Nov 10 12:12:21 2016 -0500 Committer: scnakandala <[email protected]> Committed: Thu Nov 10 12:12:21 2016 -0500 ---------------------------------------------------------------------- .../app/catalog/impl/ComputeResourceImpl.java | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/3fa3c3f6/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java index 84465c2..4c78a0c 100644 --- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java +++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/impl/ComputeResourceImpl.java @@ -22,10 +22,9 @@ package org.apache.airavata.registry.core.app.catalog.impl; import org.apache.airavata.model.appcatalog.computeresource.*; -import org.apache.airavata.model.data.movement.*; import org.apache.airavata.model.data.movement.DMType; +import org.apache.airavata.model.data.movement.*; import org.apache.airavata.model.parallelism.ApplicationParallelismType; -import org.apache.airavata.registry.core.app.catalog.model.ParallelismPrefixCommand; import org.apache.airavata.registry.core.app.catalog.resources.*; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogThriftConversion; import org.apache.airavata.registry.core.app.catalog.util.AppCatalogUtils; @@ -824,11 +823,13 @@ public class ComputeResourceImpl implements ComputeResource { Map<JobManagerCommand, String> jobManagerCommands = resourceJobManager.getJobManagerCommands(); if (jobManagerCommands!=null && jobManagerCommands.size() != 0) { 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.get(commandType) != null && !jobManagerCommands.get(commandType).isEmpty()) { + JobManagerCommandResource r = new JobManagerCommandResource(); + r.setCommandType(commandType.toString()); + r.setCommand(jobManagerCommands.get(commandType)); + r.setResourceJobManagerId(resource.getResourceJobManagerId()); + r.save(); + } } } @@ -864,10 +865,12 @@ public class ComputeResourceImpl implements ComputeResource { }else { existingCommand = new JobManagerCommandResource(); } - existingCommand.setCommandType(commandType.toString()); - existingCommand.setCommand(jobManagerCommands.get(commandType)); - existingCommand.setResourceJobManagerId(resource.getResourceJobManagerId()); - existingCommand.save(); + if(jobManagerCommands.get(commandType) != null && !jobManagerCommands.get(commandType).isEmpty()) { + existingCommand.setCommandType(commandType.toString()); + existingCommand.setCommand(jobManagerCommands.get(commandType)); + existingCommand.setResourceJobManagerId(resource.getResourceJobManagerId()); + existingCommand.save(); + } } }
