Merge branch 'master' of github.com:spullara/mustache.java

Sam Pullara · Sam Pullara · commit 147888889a27 · 2012-03-26T17:58:52.000-07:00
diff --git a/compiler/src/main/java/com/github/mustachejava/codes/IterableCode.java b/compiler/src/main/java/com/github/mustachejava/codes/IterableCode.java
@@ -17,12 +17,12 @@
 import java.util.concurrent.ExecutorService;
 
 /**
-* Created by IntelliJ IDEA.
-* User: spullara
-* Date: 1/9/12
-* Time: 2:57 PM
-* To change this template use File | Settings | File Templates.
-*/
+ * Created by IntelliJ IDEA.
+ * User: spullara
+ * Date: 1/9/12
+ * Time: 2:57 PM
+ * To change this template use File | Settings | File Templates.
+ */
 public class IterableCode extends DefaultCode implements Iteration {
 
   private final String variable;
diff --git a/compiler/src/main/java/com/github/mustachejava/util/LatchedWriter.java b/compiler/src/main/java/com/github/mustachejava/util/LatchedWriter.java
@@ -33,34 +33,27 @@ public LatchedWriter(Writer writer) {
   }
 
   // Call this when your processing is complete
-  public synchronized void done() {
+  public synchronized void done() throws IOException {
+    writer.append(buffer);
     latch.countDown();
   }
 
   // If you fail to complete, put an exception here
   public void failed(Throwable e) {
     this.e = e;
-    done();
+    latch.countDown();
   }
 
   @Override
   public synchronized void write(char[] cbuf, int off, int len) throws IOException {
     checkException();
     if (latch.getCount() == 0) {
-      checkWrite();
       writer.write(cbuf, off, len);
     } else {
       buffer.append(cbuf, off, len);
     }
   }
 
-  private void checkWrite() throws IOException {
-    if (!isWritten) {
-      isWritten = true;
-      writer.append(buffer);
-    }
-  }
-
   private void checkException() throws IOException {
     if (e != null) {
       if (e instanceof IOException) {
@@ -76,7 +69,6 @@ public void flush() throws IOException {
     if (latch.getCount() == 0) {
       checkException();
       synchronized (this) {
-        checkWrite();
         writer.flush();
       }
     }
diff --git a/compiler/src/test/java/com/github/mustachejava/InterpreterTest.java b/compiler/src/test/java/com/github/mustachejava/InterpreterTest.java
@@ -45,6 +45,36 @@ int taxed_value() {
     assertEquals(getContents(root, "simple.txt"), sw.toString());
   }
 
+  public void testNestedLatches() throws IOException {
+    MustacheFactory c = new DefaultMustacheFactory(root);
+    Mustache m = c.compile("latchedtest.html");
+    StringWriter sw = new StringWriter();
+    m.execute(sw, new Object() {
+      Callable<Object> nest = new Callable<Object>() {
+        @Override
+        public Object call() throws Exception {
+          Thread.sleep(300);
+          return "How";
+        }
+      };
+      Callable<Object> nested = new Callable<Object>() {
+        @Override
+        public Object call() throws Exception {
+          Thread.sleep(200);
+          return "are";
+        }
+      };
+      Callable<Object> nestest = new Callable<Object>() {
+        @Override
+        public Object call() throws Exception {
+          Thread.sleep(100);
+          return "you?";
+        }
+      };
+    });
+    assertEquals(getContents(root, "latchedtest.txt"), sw.toString());
+  }
+
   public void testBrokenSimple() throws MustacheException, IOException, ExecutionException, InterruptedException {
     try {
       MustacheFactory c = init();
diff --git a/src/test/resources/latchedtest.html b/src/test/resources/latchedtest.html
@@ -0,0 +1,13 @@
+{{#nest}}
+{{.}}
+  {{#nested}}
+{{.}}
+    {{#nestest}}
+    {{/nestest}}
+  {{/nested}}
+  {{#nested}}
+    {{#nestest}}
+{{.}}
+    {{/nestest}}
+  {{/nested}}
+{{/nest}}
diff --git a/src/test/resources/latchedtest.txt b/src/test/resources/latchedtest.txt
@@ -0,0 +1,3 @@
+How
+are
+you?
