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

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2010-07-26 12:09:10 -0500 (Mon, 26 Jul 2010)
New Revision: 3476

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/OutFiles.java
Log:
fixed bug introduced in previous commit

Modified: trunk/src/org/griphyn/vdl/karajan/lib/OutFiles.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/OutFiles.java	2010-07-24 04:47:35 UTC (rev 3475)
+++ trunk/src/org/griphyn/vdl/karajan/lib/OutFiles.java	2010-07-26 17:09:10 UTC (rev 3476)
@@ -16,7 +16,7 @@
 import org.griphyn.vdl.mapping.DSHandle;
 import org.griphyn.vdl.mapping.Path;
 
-public class OutFiles extends AbstractSequentialWithArguments {
+public class OutFiles extends VDLFunction {
     public static final Arg STAGEOUTS = new Arg.Positional("stageouts");
 
     static {
@@ -24,7 +24,7 @@
     }
 
     @Override
-    protected void post(VariableStack stack) throws ExecutionException {
+    protected Object function(VariableStack stack) throws ExecutionException {
         List files = TypeUtil.toList(STAGEOUTS.getValue(stack));
         VariableArguments ret = ArgUtil.getVariableReturn(stack);
         try {
@@ -33,13 +33,13 @@
                 Path p = Path.parse(TypeUtil.toString(pv.get(0)));
                 DSHandle handle = (DSHandle) pv.get(1);
                 DSHandle leaf = handle.getField(p);
-                String fname = VDLFunction.filename(leaf)[0];
+                String fname = argList(VDLFunction.filename(leaf), true);
                 ret.append(fname);
             }
         }
         catch (Exception e) {
             throw new ExecutionException(e);
         }
-        super.post(stack);
+        return null;
     }
 }