Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B8621179DC for ; Mon, 13 Apr 2015 21:16:24 +0000 (UTC) Received: (qmail 81865 invoked by uid 500); 13 Apr 2015 21:15:50 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 81813 invoked by uid 500); 13 Apr 2015 21:15:50 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 81804 invoked by uid 99); 13 Apr 2015 21:15:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Apr 2015 21:15:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C2F4E0513; Mon, 13 Apr 2015 21:15:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lahiru@apache.org To: commits@airavata.apache.org Date: Mon, 13 Apr 2015 21:15:50 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] airavata git commit: fixing out handlers not invoking issue Repository: airavata Updated Branches: refs/heads/master a4daa528a -> 2b935a4a7 fixing out handlers not invoking issue Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2dbd798d Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2dbd798d Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2dbd798d Branch: refs/heads/master Commit: 2dbd798d1eceeaf9157a4540836ffc87ef85de39 Parents: 93d4421 Author: Lahiru Gunathilake Authored: Mon Apr 13 17:15:39 2015 -0400 Committer: Lahiru Gunathilake Committed: Mon Apr 13 17:15:39 2015 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/core/utils/OutHandlerWorker.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/2dbd798d/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java index 217dc25..62d8689 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/utils/OutHandlerWorker.java @@ -47,6 +47,7 @@ public class OutHandlerWorker implements Runnable { this.gfac = gfac; this.monitorID = monitorID; this.monitorPublisher = monitorPublisher; + this.jEC = monitorID.getJobExecutionContext(); } public OutHandlerWorker(JobExecutionContext jEC, MonitorPublisher monitorPublisher) { @@ -60,7 +61,7 @@ public class OutHandlerWorker implements Runnable { try { // gfac.invokeOutFlowHandlers(monitorID.getJobExecutionContext()); gfac.invokeOutFlowHandlers(jEC); - } catch (GFacException e) { + } catch (Exception e) { TaskIdentifier taskIdentifier = new TaskIdentifier(monitorID.getTaskID(), monitorID.getWorkflowNodeID(),monitorID.getExperimentID(), monitorID.getJobExecutionContext().getGatewayID()); //FIXME this is a case where the output retrieving fails even if the job execution was a success. Thus updating the task status monitorPublisher.publish(new TaskStatusChangeRequestEvent(TaskState.FAILED, taskIdentifier));