airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject airavata git commit: fixing NPE
Date Wed, 29 Apr 2015 16:43:37 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 8ef27824c -> fc1cffb22


fixing NPE


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

Branch: refs/heads/master
Commit: fc1cffb221290d876adfc2ec6d666bbff01e7166
Parents: 8ef2782
Author: Lahiru Gunathilake <glahiru@gmail.com>
Authored: Wed Apr 29 12:43:31 2015 -0400
Committer: Lahiru Gunathilake <glahiru@gmail.com>
Committed: Wed Apr 29 12:43:31 2015 -0400

----------------------------------------------------------------------
 .../apache/airavata/client/samples/CreateLaunchExperiment.java | 6 +++---
 .../java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/fc1cffb2/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 51cc760..a8d2653 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -58,7 +58,7 @@ public class CreateLaunchExperiment {
     private static final String DEFAULT_GATEWAY = "php_reference_gateway";
     private static Airavata.Client airavataClient;
 
-    private static String echoAppId = "Echo_a3c69094-2591-47d9-b5c4-e14c9fa5abf5";
+    private static String echoAppId = "Echo_f6eabb22-a7c0-4e13-90bc-7874c2d54a7d";
     private static String mpiAppId = "HelloMPI_bfd56d58-6085-4b7f-89fc-646576830518";
     private static String wrfAppId = "WRF_7ad5da38-c08b-417c-a9ea-da9298839762";
     private static String amberAppId = "Amber_cb54b269-cf79-4276-8dbb-2ec16b759cc6";
@@ -168,12 +168,12 @@ public class CreateLaunchExperiment {
 //                final String expId = createMPIExperimentForFSD(airavataClient);
 //               final String expId = createEchoExperimentForStampede(airavataClient);
 //                final String expId = createEchoExperimentForTrestles(airavataClient);
-//                final String expId = createExperimentEchoForLocalHost(airavataClient);
+                final String expId = createExperimentEchoForLocalHost(airavataClient);
 //                final String expId = createExperimentWRFTrestles(airavataClient);
 //                final String expId = createExperimentForBR2(airavataClient);
 //                final String expId = createExperimentForBR2Amber(airavataClient);
 //                final String expId = createExperimentWRFStampede(airavataClient);
-                final String expId = createExperimentForStampedeAmber(airavataClient);
+//                final String expId = createExperimentForStampedeAmber(airavataClient);
 //                String expId = createExperimentForTrestlesAmber(airavataClient);
 //                final String expId = createExperimentGROMACSStampede(airavataClient);
 //                final String expId = createExperimentESPRESSOStampede(airavataClient);

http://git-wip-us.apache.org/repos/asf/airavata/blob/fc1cffb2/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
index d64cf42..df7b840 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java
@@ -964,6 +964,7 @@ public class BetterGfacImpl implements GFac,Watcher {
                 synchronized (mutex) {
                     mutex.wait(5000);  // waiting for the syncConnected event
                 }
+                experimentPath = AiravataZKUtils.getExpZnodePath(jobExecutionContext.getExperimentID());
                 if (jobExecutionContext.getZk().exists(experimentPath, false) == null) {
                     log.error("Experiment is already finalized so no output handlers will
be invoked");
                     return;


Mime
View raw message