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 A518717BA2 for ; Wed, 27 May 2015 18:25:43 +0000 (UTC) Received: (qmail 8230 invoked by uid 500); 27 May 2015 18:25:43 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 8189 invoked by uid 500); 27 May 2015 18:25:43 -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 8180 invoked by uid 99); 27 May 2015 18:25:43 -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; Wed, 27 May 2015 18:25:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 76920DFFF0; Wed, 27 May 2015 18:25:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Message-Id: <377f95503d9f4517af287a55096e8290@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: airavata git commit: Fixed gordon job verification issue. Date: Wed, 27 May 2015 18:25:43 +0000 (UTC) Repository: airavata Updated Branches: refs/heads/master a26c1e783 -> 4e9aa00a4 Fixed gordon job verification issue. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4e9aa00a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4e9aa00a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4e9aa00a Branch: refs/heads/master Commit: 4e9aa00a48801fe142a0588a69bf7118cca90dfa Parents: a26c1e7 Author: Shameera Rathanyaka Authored: Wed May 27 14:25:40 2015 -0400 Committer: Shameera Rathanyaka Committed: Wed May 27 14:25:40 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/4e9aa00a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java index 3304465..321b67e 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/job/PBSOutputParser.java @@ -195,7 +195,7 @@ public class PBSOutputParser implements OutputParser { @Override public String parseJobId(String jobName, String rawOutput) throws SSHApiException { String regJobId = "jobId"; - Pattern pattern = Pattern.compile("(?=(?<" + regJobId + ">\\d+)\\s+\\w+\\s+" + jobName + ")"); // regex - look ahead and match + Pattern pattern = Pattern.compile("(?<" + regJobId + ">[^\\s]*).* " + jobName + " "); // regex , JOB_ID will come as first column if (rawOutput != null) { Matcher matcher = pattern.matcher(rawOutput); if (matcher.find()) {