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

[wozniak at ci.uchicago.edu]

Author: wozniak
Date: 2011-04-04 10:36:32 -0500 (Mon, 04 Apr 2011)
New Revision: 4255

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
Log:
Better handling of Swift assert() failure


Modified: trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java	2011-04-04 14:03:39 UTC (rev 4254)
+++ trunk/src/org/griphyn/vdl/karajan/lib/VDLFunction.java	2011-04-04 15:36:32 UTC (rev 4255)
@@ -32,6 +32,7 @@
 import org.globus.swift.catalog.TCEntry;
 import org.globus.swift.catalog.transformation.File;
 import org.globus.swift.catalog.types.TCType;
+import org.griphyn.vdl.karajan.AssertFailedException;
 import org.griphyn.vdl.karajan.TCCache;
 import org.griphyn.vdl.karajan.VDL2FutureException;
 import org.griphyn.vdl.karajan.WrapperMap;
@@ -50,7 +51,6 @@
 import org.griphyn.vdl.util.FQN;
 import org.griphyn.vdl.util.VDL2ConfigProperties;
 
-
 public abstract class VDLFunction extends SequentialWithArguments {
 	public static final Logger logger = Logger.getLogger(VDLFunction.class);
 
@@ -58,7 +58,7 @@
 
 	public static final Arg OA_PATH = new Arg.Optional("path", "");
 	public static final Arg PA_PATH = new Arg.Positional("path");
-	public static final Arg PA_VAR = new Arg.Positional("var");
+	public static final Arg PA_VAR = new Arg.Positional("var"); 
 	public static final Arg OA_ISARRAY = new Arg.Optional("isArray", Boolean.FALSE);
 
 	public final void post(VariableStack stack) throws ExecutionException {
@@ -69,6 +69,10 @@
 			}
 			super.post(stack);
 		}
+		catch (AssertFailedException e) { 
+		    logger.fatal("swift: assert failed: " + e.getMessage());
+		    stack.getExecutionContext().failedQuietly(stack, e);
+		}
 		catch (HandleOpenException e) {
 			throw new FutureNotYetAvailable(VDLFunction.addFutureListener(stack, e.getSource()));
 		}