found a bug in inverted -- didnt allow for Future false

Sam Pullara · Sam Pullara · commit 07006b5e88b6 · 2011-09-08T11:58:49.000-07:00
diff --git a/core/src/main/java/com/sampullara/mustache/Mustache.java b/core/src/main/java/com/sampullara/mustache/Mustache.java
@@ -16,6 +16,7 @@
 import java.util.NoSuchElementException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
@@ -510,12 +511,23 @@ protected Iterable<Scope> inverted(final Scope s, final String name) {
       String traceName = parent == null ? s.getClass().getName() : parent.getClass().getName();
       event = MustacheTrace.addEvent("inverted: " + name, traceName);
     }
-    final Object value = getValue(s, name);
+    Object possibleFuture = getValue(s, name);
+    while (possibleFuture instanceof Future) {
+      try {
+        possibleFuture = ((Future) possibleFuture).get();
+      } catch (Exception e) {
+        logger.log(Level.SEVERE, "Could not get inverted: " + name, e);
+        return null;
+      }
+    }
+    final Object value = possibleFuture;
     if (trace) {
       event.end();
     }
+
     boolean isntEmpty = value instanceof Iterable && ((Iterable) value).iterator().hasNext();
-    if (isntEmpty || (value instanceof Boolean && ((Boolean) value)) ||
+    if (isntEmpty ||
+            (value instanceof Boolean && ((Boolean) value)) ||
         (value != null && !(value instanceof Iterable) && !(value instanceof Boolean))) {
       return EMPTY;
     }
diff --git a/core/src/main/java/com/sampullara/mustache/MustacheTrace.java b/core/src/main/java/com/sampullara/mustache/MustacheTrace.java
@@ -27,10 +27,10 @@ public static class Event {
     public String name;
     public String parameter;
 
-    public Event(String name, String parameter, String unique) {
+    public Event(String name, String parameter, String thread) {
       this.name = name;
       this.parameter = parameter;
-      this.thread = unique;
+      this.thread = thread;
     }
 
     public String toString() {
diff --git a/nodetest.js b/nodetest.js
@@ -23,13 +23,14 @@ fs.readFile("src/test/resources/complex.html", function(err, data) {
   var html = m.to_html(template, view);
   var start = new Date().getTime();
   var total = 0;
+  sys.puts(m.to_html(template, view));
   while(true) {
     m.to_html(template, view);
     total++;
-    if (new Date().getTime() - start > 1000) {
+    if (new Date().getTime() - start > 5000) {
       break;
     }
   }
-  sys.puts(total);
+  sys.puts(total / 5);
 });
 
