airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject airavata git commit: FIXED- appcatalog setter always set to null in JEC if we call with null value
Date Thu, 13 Nov 2014 20:59:19 GMT
Repository: airavata
Updated Branches:
  refs/heads/master c87156880 -> 7a352c462


FIXED-  appcatalog setter always set to null in JEC if we call with null value


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7a352c46
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7a352c46
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7a352c46

Branch: refs/heads/master
Commit: 7a352c462a2e2bbc3515fe40b7e7a5cd3183a234
Parents: c871568
Author: shamrath <shameerainfo@gmail.com>
Authored: Thu Nov 13 15:59:13 2014 -0500
Committer: shamrath <shameerainfo@gmail.com>
Committed: Thu Nov 13 15:59:13 2014 -0500

----------------------------------------------------------------------
 .../airavata/gfac/core/context/JobExecutionContext.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/7a352c46/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
index ab15445..c8c48ef 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/context/JobExecutionContext.java
@@ -189,14 +189,15 @@ public class JobExecutionContext extends AbstractContext implements
Serializable
     }
 
     public void setAppCatalog(AppCatalog appCatalog) {
-        if (appCatalog == null){
+        if (appCatalog == null) {
             try {
                 this.appCatalog = AppCatalogFactory.getAppCatalog();
             } catch (AppCatalogException e) {
-                log.error("Unable to create app catalog instance" , e);
+                log.error("Unable to create app catalog instance", e);
             }
+        } else {
+            this.appCatalog = appCatalog;
         }
-        this.appCatalog = appCatalog;
     }
 
     public String getExperimentID() {


Mime
View raw message