airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject svn commit: r1516228 - /airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
Date Wed, 21 Aug 2013 17:23:38 GMT
Author: lahiru
Date: Wed Aug 21 17:23:37 2013
New Revision: 1516228

URL: http://svn.apache.org/r1516228
Log:
fixing https://issues.apache.org/jira/browse/AIRAVATA-903.

Modified:
    airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java

Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1516228&r1=1516227&r2=1516228&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
(original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java
Wed Aug 21 17:23:37 2013
@@ -23,12 +23,7 @@ package org.apache.airavata.xbaya.invoke
 import java.io.File;
 import java.io.StringReader;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
@@ -304,7 +299,7 @@ public class EmbeddedGFacInvoker impleme
                 HostScheduler hostScheduler = aClass.newInstance();
                 registeredHost = hostScheduler.schedule(registeredHosts);
             } else {
-                // if user specify a host, no matter what we pick that host for all the nodes,
todo: allow users to specifi node specific host
+                // if user specify a host, no matter what we pick that host for all the nodes,
todo: allow users to specify node specific host
                 registeredHost = airavataAPI.getApplicationManager().getHostDescription(hostName);
             }
             ApplicationDescription applicationDescription =
@@ -510,7 +505,13 @@ public class EmbeddedGFacInvoker impleme
         try {
             waitToFinish();
             if (outPut instanceof XmlElement) {
-                return ((XmlElement) ((XmlElement) ((XmlElement) outPut).children().next()).children().next()).children().next();
+                Iterator children = ((XmlElement) outPut).children();
+                while (children.hasNext()) {
+                    Object next = children.next();
+                    if (((XmlElement) next).getName().equals(name)) {
+                        return ((XmlElement)((XmlElement) next).children().next()).children().next();
+                    }
+                }
             } else {
                 return outPut;
             }
@@ -532,6 +533,7 @@ public class EmbeddedGFacInvoker impleme
             this.notifier.invocationFailed(message, e);
             throw new WorkflowException(message, e);
         }
+        throw new WorkflowException("Output could not be found");
     }
 
     /**



Mime
View raw message