[Swift-commit] r5849 - trunk/src/org/griphyn/vdl/mapping

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2012-07-17 13:48:19 -0500 (Tue, 17 Jul 2012)
New Revision: 5849

Modified:
   trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java
Log:
fix merge

Modified: trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java	2012-07-17 18:48:00 UTC (rev 5848)
+++ trunk/src/org/griphyn/vdl/mapping/ArrayDataNode.java	2012-07-17 18:48:19 UTC (rev 5849)
@@ -91,13 +91,13 @@
         }
     }
     
-    private void addKey(String name) {
+    private void addKey(Comparable<?> key) {
         ArrayIndexFutureList w;
         synchronized(this) {
             w = (ArrayIndexFutureList) wrapper;
         }
         if (w != null) {
-            w.addKey(name);
+            w.addKey(key);
         }
     }