You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/08/27 19:43:26 UTC
airavata git commit: NPE check at yamlConfiguration
Repository: airavata
Updated Branches:
refs/heads/master 9534a8104 -> 869a62504
NPE check at yamlConfiguration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/869a6250
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/869a6250
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/869a6250
Branch: refs/heads/master
Commit: 869a625046b74606070a140ac447fa3dfabbb4e1
Parents: 9534a81
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Aug 27 13:43:18 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Aug 27 13:43:18 2015 -0400
----------------------------------------------------------------------
.../configuration/server/src/main/resources/gfac-config.yaml | 3 +--
.../apache/airavata/gfac/core/config/GFacYamlConfigruation.java | 5 ++++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/869a6250/modules/configuration/server/src/main/resources/gfac-config.yaml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/gfac-config.yaml b/modules/configuration/server/src/main/resources/gfac-config.yaml
index 5fd859e..8dafe09 100644
--- a/modules/configuration/server/src/main/resources/gfac-config.yaml
+++ b/modules/configuration/server/src/main/resources/gfac-config.yaml
@@ -104,5 +104,4 @@ resources:
- iu.xsede.edu # test resource mail address
- jobManagerType: FORK
- commandOutputParser: org.apache.airavata.gfac.impl.job.ForkOutputParser
-
+ commandOutputParser: org.apache.airavata.gfac.impl.job.ForkOutputParser
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/869a6250/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/config/GFacYamlConfigruation.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/config/GFacYamlConfigruation.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/config/GFacYamlConfigruation.java
index 5101b41..dfd396a 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/config/GFacYamlConfigruation.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/config/GFacYamlConfigruation.java
@@ -122,7 +122,10 @@ public class GFacYamlConfigruation {
identifier = resource.get(JOB_MANAGER_TYPE).toString();
resourceConfig.setJobManagerType(ResourceJobManagerType.valueOf(identifier));
resourceConfig.setCommandOutputParser(resource.get(COMMAND_OUTPUT_PARSER).toString());
- resourceConfig.setEmailParser(resource.get(EMAIL_PARSER).toString());
+ Object emailParser = resource.get(EMAIL_PARSER);
+ if (emailParser != null){
+ resourceConfig.setEmailParser(emailParser.toString());
+ }
List<String> emailAddressList = (List<String>) resource.get(RESOURCE_EMAIL_ADDRESS);
resourceConfig.setResourceEmailAddresses(emailAddressList);
resources.add(resourceConfig);