svn commit: r1534718 - /airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java

[ra...@apache.org]

Author: raminder
Date: Tue Oct 22 18:26:10 2013
New Revision: 1534718

URL: http://svn.apache.org/r1534718
Log:
Simplified the regex to support spaces AIRAVATA-933 

Modified:
    airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java

Modified: airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java?rev=1534718&r1=1534717&r2=1534718&view=diff
==============================================================================
--- airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java (original)
+++ airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java Tue Oct 22 18:26:10 2013
@@ -32,10 +32,9 @@ import org.apache.airavata.commons.gfac.
 import org.apache.airavata.gfac.handler.GFacHandlerException;
 import org.apache.airavata.schemas.gfac.StdErrParameterType;
 import org.apache.airavata.schemas.gfac.StdOutParameterType;
-import org.apache.airavata.schemas.gfac.URIParameterType;
 
 public class OutputUtils {
-    private static String regexPattern = "\\s*=\\s*([^\\[\\s'\"][^\\s]*|\"[^\"]*\"|'[^']*'|\\[[^\\[]*\\])";
+    private static String regexPattern = "\\s*=\\s*(.*)\\r?\\n";
 
     public static Map<String, ActualParameter> fillOutputFromStdout(Map<String, Object> output, String stdout, String stderr) throws Exception {
 
@@ -95,7 +94,7 @@ public class OutputUtils {
             match.append(matcher.group(1) + StringUtil.DELIMETER);
         }
         if (match != null) {
-            return StringUtil.getElementsFromString(match.toString());
+        	return StringUtil.getElementsFromString(match.toString());
         } else {
             throw new Exception("Data for the output parameter '" + outParam + "' was not found");
         }