airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject git commit: Fixed compilation problem.. need to investagte how to include job notification if job id is not created for experiment data. There is a null pointer coming.
Date Thu, 07 Aug 2014 21:23:25 GMT
Repository: airavata
Updated Branches:
  refs/heads/master d6ffefa81 -> f29d7e66a


Fixed compilation problem.. need to investagte how to include job
notification if job id is not created for experiment data. There is a
null pointer coming.

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

Branch: refs/heads/master
Commit: f29d7e66a865108e16a42f1641dabd4b06b8ef7d
Parents: d6ffefa
Author: raminder <raminder@apache.org>
Authored: Thu Aug 7 17:22:56 2014 -0400
Committer: raminder <raminder@apache.org>
Committed: Thu Aug 7 17:22:56 2014 -0400

----------------------------------------------------------------------
 .../org/apache/airavata/gfac/core/cpi/BetterGfacImpl.java   | 9 ++++-----
 .../java/org/apache/airavata/gfac/core/cpi/GFacImpl.java    | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/f29d7e66/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 e839aa1..a68a302 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
@@ -57,7 +57,7 @@ import org.apache.airavata.gfac.core.monitor.ExperimentIdentity;
 import org.apache.airavata.gfac.core.monitor.JobIdentity;
 import org.apache.airavata.gfac.core.monitor.MonitorID;
 import org.apache.airavata.gfac.core.monitor.TaskIdentity;
-import org.apache.airavata.gfac.core.monitor.state.ExperimentStatusChangedEvent;
+//import org.apache.airavata.api.server.listener.ExperimentStatusChangedEvent;
 import org.apache.airavata.gfac.core.monitor.state.GfacExperimentStateChangeRequest;
 import org.apache.airavata.gfac.core.monitor.state.JobStatusChangeRequest;
 import org.apache.airavata.gfac.core.monitor.state.TaskStatusChangeRequest;
@@ -588,8 +588,8 @@ public class BetterGfacImpl implements GFac {
 			} catch (NullPointerException e1) {
 				log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses
to failed, "
 						+ "NullPointerException occurred because at this point there might not have Job Created",
e1, e);
-				monitorPublisher
-						.publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()),
ExperimentState.FAILED));
+//				monitorPublisher
+//						.publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()),
ExperimentState.FAILED));
 				// Updating the task status if there's any task associated
 				monitorPublisher.publish(new TaskStatusChangedEvent(new TaskIdentity(jobExecutionContext.getExperimentID(),
jobExecutionContext
 						.getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskID()),
TaskState.FAILED));
@@ -646,8 +646,7 @@ public class BetterGfacImpl implements GFac {
 			} catch (NullPointerException e1) {
 				log.error("Error occured during updating the statuses of Experiments,tasks or Job statuses
to failed, "
 						+ "NullPointerException occurred because at this point there might not have Job Created",
e1, e);
-				monitorPublisher
-						.publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()),
ExperimentState.FAILED));
+				//monitorPublisher.publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()),
ExperimentState.FAILED));
 				// Updating the task status if there's any task associated
 				monitorPublisher.publish(new TaskStatusChangeRequest(new TaskIdentity(jobExecutionContext.getExperimentID(),
jobExecutionContext
 						.getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskID()),
TaskState.FAILED));

http://git-wip-us.apache.org/repos/asf/airavata/blob/f29d7e66/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
index 0d7bbcd..d370924 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
@@ -54,7 +54,7 @@ import org.apache.airavata.gfac.core.monitor.ExperimentIdentity;
 import org.apache.airavata.gfac.core.monitor.JobIdentity;
 import org.apache.airavata.gfac.core.monitor.MonitorID;
 import org.apache.airavata.gfac.core.monitor.TaskIdentity;
-import org.apache.airavata.gfac.core.monitor.state.ExperimentStatusChangedEvent;
+//import org.apache.airavata.api.server.listener.ExperimentStatusChangedEvent;
 import org.apache.airavata.gfac.core.monitor.state.JobStatusChangeRequest;
 import org.apache.airavata.gfac.core.monitor.state.TaskStatusChangeRequest;
 import org.apache.airavata.gfac.core.monitor.state.TaskStatusChangedEvent;
@@ -339,8 +339,8 @@ public class GFacImpl implements GFac {
                 log.error("Error occured during updating the statuses of Experiments,tasks
or Job statuses to failed, " +
                         "NullPointerException occurred because at this point there might
not have Job Created", e1, e);
                 // Updating status if job id is not set
-				monitorPublisher
-						.publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()),
ExperimentState.FAILED));
+//				monitorPublisher
+//						.publish(new ExperimentStatusChangedEvent(new ExperimentIdentity(jobExecutionContext.getExperimentID()),
ExperimentState.FAILED));
 				// Updating the task status if there's any task associated
 				monitorPublisher.publish(new TaskStatusChangedEvent(new TaskIdentity(jobExecutionContext.getExperimentID(),
jobExecutionContext
 						.getWorkflowNodeDetails().getNodeInstanceId(), jobExecutionContext.getTaskData().getTaskID()),
TaskState.FAILED));


Mime
View raw message