Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 61C54200C6F for ; Tue, 9 May 2017 19:12:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 607F4160BC8; Tue, 9 May 2017 17:12:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id ADBDC160B9A for ; Tue, 9 May 2017 19:12:52 +0200 (CEST) Received: (qmail 67499 invoked by uid 500); 9 May 2017 17:12:51 -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 67489 invoked by uid 99); 9 May 2017 17:12:51 -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; Tue, 09 May 2017 17:12:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8BC9DFE61; Tue, 9 May 2017 17:12:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Tue, 09 May 2017 17:12:51 -0000 Message-Id: <1cec185325694112a3e44df925a4565e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] airavata git commit: LSF job id parsing checks if there is job id before parsing archived-at: Tue, 09 May 2017 17:12:53 -0000 Repository: airavata Updated Branches: refs/heads/develop 44f9493e6 -> a1c3e83eb LSF job id parsing checks if there is job id before parsing Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9ef08205 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9ef08205 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9ef08205 Branch: refs/heads/develop Commit: 9ef08205c1f030b9252177c2076b310a16f1764c Parents: 31a6705 Author: Marcus Christie Authored: Tue May 9 12:39:59 2017 -0400 Committer: Marcus Christie Committed: Tue May 9 12:39:59 2017 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/core/cluster/OutputParser.java | 2 +- .../org/apache/airavata/gfac/impl/job/LSFOutputParser.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/9ef08205/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java index abe1805..59cf94d 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cluster/OutputParser.java @@ -30,7 +30,7 @@ public interface OutputParser { /** * This can be used to parseSingleJob the result of a job submission to get the JobID * @param rawOutput - * @return + * @return the job id as a String, or null if no job id found */ public String parseJobSubmission(String rawOutput)throws GFacException; http://git-wip-us.apache.org/repos/asf/airavata/blob/9ef08205/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java index 0a82091..aab20b8 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/job/LSFOutputParser.java @@ -40,7 +40,11 @@ public class LSFOutputParser implements OutputParser { @Override public String parseJobSubmission(String rawOutput) throws GFacException { logger.debug(rawOutput); - return rawOutput.substring(rawOutput.indexOf("<")+1,rawOutput.indexOf(">")); + if (rawOutput.indexOf("<") >= 0) { + return rawOutput.substring(rawOutput.indexOf("<")+1,rawOutput.indexOf(">")); + } else { + return null; + } } @Override