[Swift-commit] r4669 - trunk/src/org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-06-23 13:31:20 -0500 (Thu, 23 Jun 2011)
New Revision: 4669

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java
Log:
deal with array returns such as the ones from @filenames

Modified: trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java	2011-06-23 18:30:27 UTC (rev 4668)
+++ trunk/src/org/griphyn/vdl/karajan/lib/UnwrapClosedList.java	2011-06-23 18:31:20 UTC (rev 4669)
@@ -5,6 +5,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.globus.cog.karajan.arguments.Arg;
@@ -28,7 +29,15 @@
 		List<Object> r = new ArrayList<Object>(l.size());
 		
 		for (DSHandle h : l) {
-		    r.add(h.getValue());
+		    if (h.getType().isArray()) {
+		        Map<String, DSHandle> m = h.getArrayValue();
+		        for (DSHandle h2 : m.values()) {
+		            r.add(h2.getValue());
+		        }
+		    }
+		    else {
+		        r.add(h.getValue());
+		    }
 		}
 		
 		return r;