[Swift-commit] r5413 - branches/release-0.93/src/org/griphyn/vdl/karajan/lib

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-12-14 13:22:58 -0600 (Wed, 14 Dec 2011)
New Revision: 5413

Modified:
   branches/release-0.93/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
Log:
revert change to fix bug 664 because it doesn't really fix it and it causes one of the fixed array mapper tests to fail

Modified: branches/release-0.93/src/org/griphyn/vdl/karajan/lib/VDLFunction.java
===================================================================
--- branches/release-0.93/src/org/griphyn/vdl/karajan/lib/VDLFunction.java	2011-12-13 20:40:15 UTC (rev 5412)
+++ branches/release-0.93/src/org/griphyn/vdl/karajan/lib/VDLFunction.java	2011-12-14 19:22:58 UTC (rev 5413)
@@ -199,15 +199,7 @@
 	    Mapper mapper;
 	    	    
         synchronized (var.getRoot()) {
-            if (var instanceof AbstractDataNode) {
-                mapper = ((AbstractDataNode) var).getActualMapper();
-                if (mapper == null) {
-                    throw new ExecutionException(var + " is not a mapped type");
-                }
-            }
-            else {
-                mapper = var.getMapper();
-            }
+            mapper = var.getMapper();
         }
 		List<String> l = new ArrayList<String>();
 		try {