airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramin...@apache.org
Subject [1/2] git commit: Type of stdout and error coming as string so added extra check. AIRAVATA-1077
Date Thu, 13 Mar 2014 11:24:48 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 5b6e610b2 -> dfb51fcc9


Type of stdout and error coming as string so added extra check.
AIRAVATA-1077

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

Branch: refs/heads/master
Commit: 1c06fe07c1a2761bd20e0f2504b2d322bddc1dbc
Parents: 0a46c0c
Author: raminder <raminder@apache.org>
Authored: Thu Mar 13 07:24:04 2014 -0400
Committer: raminder <raminder@apache.org>
Committed: Thu Mar 13 07:24:04 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/airavata/gfac/utils/OutputUtils.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/1c06fe07/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
index bc3367f..ae8caee 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/utils/OutputUtils.java
@@ -51,13 +51,16 @@ public class OutputUtils {
             if (actual == null) {
                 continue;
             }
-            if ("StdOut".equals(actual.getType().getType().toString())) {
+            if ("StdOut".equals(actual.getType().getType().toString()) && paramName
== "stdout") {
                 ((StdOutParameterType) actual.getType()).setValue(stdout);
                 result.put(paramName, actual);
-            } else if ("StdErr".equals(actual.getType().getType().toString())) {
+            } else if ("StdErr".equals(actual.getType().getType().toString()) &&
paramName == "stderr") {
                 ((StdErrParameterType) actual.getType()).setValue(stderr);
                 result.put(paramName, actual);
-            } else {
+            }else if("URI".equals(actual.getType().getType().toString())){
+            	continue;
+            } 
+            else {
                 String parseStdout = parseStdout(stdout, paramName);
                 if (parseStdout != null) {
                     MappingFactory.fromString(actual, parseStdout);


Mime
View raw message