Repository: airavata Updated Branches: refs/heads/develop c0665f1aa -> e4a6b18d4
Fixed NPE with resource job manager Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e4a6b18d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e4a6b18d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e4a6b18d Branch: refs/heads/develop Commit: e4a6b18d44d915554194259b3b976a52caaf527a Parents: c0665f1 Author: Shameera Rathnayaka <[email protected]> Authored: Wed Nov 9 15:43:50 2016 -0500 Committer: Shameera Rathnayaka <[email protected]> Committed: Wed Nov 9 15:43:50 2016 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e4a6b18d/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java index dcbe683..22190c9 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java @@ -607,9 +607,9 @@ public class GFacUtils { } ApplicationParallelismType parallelism = appDepDescription.getParallelism(); - Map<ApplicationParallelismType, String> parallelismPrefix = processContext.getResourceJobManager().getParallelismPrefix(); if (parallelism != null) { if (parallelism != ApplicationParallelismType.SERIAL) { + Map<ApplicationParallelismType, String> parallelismPrefix = processContext.getResourceJobManager().getParallelismPrefix(); if (parallelismPrefix != null){ String parallelismCommand = parallelismPrefix.get(parallelism); if (parallelismCommand != null){
