You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/05/27 20:44:33 UTC

airavata git commit: Improved PBS job verification regex.

Repository: airavata
Updated Branches:
  refs/heads/master 4e9aa00a4 -> 9318831bf


Improved PBS job verification regex.


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

Branch: refs/heads/master
Commit: 9318831bf8cb705ae434a32e9ecf368db912e2e2
Parents: 4e9aa00
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Wed May 27 14:44:31 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Wed May 27 14:44:31 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/9318831b/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 321b67e..1458f4c 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 + ">[^\\s]*).* " + jobName + " "); // regex , JOB_ID will come as first column 
+        Pattern pattern = Pattern.compile("\\s*(?<" + regJobId + ">[^\\s]*).* " + jobName + " "); // regex , JOB_ID will come as first column
         if (rawOutput != null) {
             Matcher matcher = pattern.matcher(rawOutput);
             if (matcher.find()) {