[Swift-commit] r6678 - branches/release-0.94/src/org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-07-29 01:43:38 -0500 (Mon, 29 Jul 2013)
New Revision: 6678

Modified:
   branches/release-0.94/src/org/griphyn/vdl/karajan/lib/PathUtils.java
Log:
those two need to return non-null, otherwise it is interpreted as nothing to return

Modified: branches/release-0.94/src/org/griphyn/vdl/karajan/lib/PathUtils.java
===================================================================
--- branches/release-0.94/src/org/griphyn/vdl/karajan/lib/PathUtils.java	2013-07-29 06:13:14 UTC (rev 6677)
+++ branches/release-0.94/src/org/griphyn/vdl/karajan/lib/PathUtils.java	2013-07-29 06:43:38 UTC (rev 6678)
@@ -39,7 +39,13 @@
 
 	public String vdl_dirname(VariableStack stack) throws ExecutionException {
 		String path = TypeUtil.toString(PATH.getValue(stack));
-		return new AbsFile(path).getDirectory();
+		String dir = new AbsFile(path).getDirectory();
+		if (dir == null) {
+			return "";
+		}
+		else {
+			return dir;
+		}
 	}
     
     static {
@@ -57,7 +63,7 @@
                 return dir;
             }
         }
-	return "";
+		return "";
     }
     
     static {