Repository: airavata Updated Branches: refs/heads/master 1e2f784a7 -> 742edee5c
Fixed nullpointer with the JSDL genarator. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/742edee5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/742edee5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/742edee5 Branch: refs/heads/master Commit: 742edee5cd03038a0cf838c79102818b3b880517 Parents: 1e2f784 Author: raminder <[email protected]> Authored: Thu May 7 10:00:27 2015 -0400 Committer: raminder <[email protected]> Committed: Thu May 7 10:00:27 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/bes/utils/JSDLGenerator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/742edee5/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLGenerator.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLGenerator.java b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLGenerator.java index 4743522..dd08bfb 100644 --- a/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLGenerator.java +++ b/modules/gfac/gfac-bes/src/main/java/org/apache/airavata/gfac/bes/utils/JSDLGenerator.java @@ -103,13 +103,13 @@ public class JSDLGenerator implements BESConstants { ApplicationContext appCtxt = context.getApplicationContext(); if (appCtxt != null) { - if (appCtxt.getComputeResourcePreference().getAllocationProjectNumber() != null) + if (appCtxt.getComputeResourcePreference() != null && appCtxt.getComputeResourcePreference().getAllocationProjectNumber() != null) JSDLUtils.addProjectName(value, appCtxt.getComputeResourcePreference().getAllocationProjectNumber()); - if (appCtxt.getApplicationInterfaceDescription().getApplicationDescription() != null) + if (appCtxt.getApplicationInterfaceDescription() != null && appCtxt.getApplicationInterfaceDescription().getApplicationDescription() != null) JSDLUtils.getOrCreateJobIdentification(value).setDescription(appCtxt.getApplicationInterfaceDescription().getApplicationDescription()); - if (appCtxt.getApplicationInterfaceDescription().getApplicationName() != null) + if (appCtxt.getApplicationInterfaceDescription() != null && appCtxt.getApplicationInterfaceDescription().getApplicationName() != null) JSDLUtils.getOrCreateJobIdentification(value).setJobName(appCtxt.getApplicationInterfaceDescription().getApplicationName()); } }
