[Swift-commit] r6621 - branches/faster/src/org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2013-07-08 14:21:48 -0500 (Mon, 08 Jul 2013)
New Revision: 6621

Modified:
   branches/faster/src/org/griphyn/vdl/karajan/lib/AppStageins.java
   branches/faster/src/org/griphyn/vdl/karajan/lib/AppStageouts.java
   branches/faster/src/org/griphyn/vdl/karajan/lib/PathUtils.java
Log:
fixed small problems caused by the merge

Modified: branches/faster/src/org/griphyn/vdl/karajan/lib/AppStageins.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/lib/AppStageins.java	2013-07-08 19:12:22 UTC (rev 6620)
+++ branches/faster/src/org/griphyn/vdl/karajan/lib/AppStageins.java	2013-07-08 19:21:48 UTC (rev 6621)
@@ -29,7 +29,9 @@
 import org.apache.log4j.Logger;
 import org.globus.cog.karajan.analyzer.ArgRef;
 import org.globus.cog.karajan.analyzer.ChannelRef;
+import org.globus.cog.karajan.analyzer.Scope;
 import org.globus.cog.karajan.analyzer.Signature;
+import org.globus.cog.karajan.analyzer.VarRef;
 import org.globus.cog.karajan.compiled.nodes.InternalFunction;
 import org.globus.cog.karajan.util.TypeUtil;
 import org.globus.swift.data.Director;

Modified: branches/faster/src/org/griphyn/vdl/karajan/lib/AppStageouts.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/lib/AppStageouts.java	2013-07-08 19:12:22 UTC (rev 6620)
+++ branches/faster/src/org/griphyn/vdl/karajan/lib/AppStageouts.java	2013-07-08 19:21:48 UTC (rev 6621)
@@ -20,7 +20,6 @@
  */
 package org.griphyn.vdl.karajan.lib;
 
-import java.util.LinkedList;
 import java.util.List;
 
 import k.rt.ExecutionException;
@@ -29,7 +28,9 @@
 
 import org.globus.cog.karajan.analyzer.ArgRef;
 import org.globus.cog.karajan.analyzer.ChannelRef;
+import org.globus.cog.karajan.analyzer.Scope;
 import org.globus.cog.karajan.analyzer.Signature;
+import org.globus.cog.karajan.analyzer.VarRef;
 import org.globus.cog.karajan.compiled.nodes.InternalFunction;
 import org.griphyn.vdl.karajan.Pair;
 import org.griphyn.vdl.mapping.AbsFile;

Modified: branches/faster/src/org/griphyn/vdl/karajan/lib/PathUtils.java
===================================================================
--- branches/faster/src/org/griphyn/vdl/karajan/lib/PathUtils.java	2013-07-08 19:12:22 UTC (rev 6620)
+++ branches/faster/src/org/griphyn/vdl/karajan/lib/PathUtils.java	2013-07-08 19:21:48 UTC (rev 6621)
@@ -68,6 +68,7 @@
     public static String remotePathName(String dir) {
         if (dir.length() == 0) {
             return dir;
+        }
         StringBuilder sb = null;
         
         // parse it by hand to avoid creating too much string object garbage