Each, else not working fix #574

Author: jknack

handlebars/src/main/java/com/github/jknack/handlebars/helper/EachHelper.java

@@ -47,7 +47,7 @@ public class EachHelper implements Helper<Object> {
    */
   public static final String NAME = "each";
 
-  @SuppressWarnings({"rawtypes", "unchecked" })
+  @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
   public Object apply(final Object context, final Options options)
       throws IOException {
@@ -79,7 +79,7 @@ public Object apply(final Object context, final Options options)
         buffer.append(options.inverse());
       }
       return buffer;
-    } else if (context != null) {
+    } else if(context != null) {
       int index = 0;
       Iterator loop = options.propertySet(context).iterator();
       Context parent = options.context;
@@ -105,8 +105,9 @@ public Object apply(final Object context, final Options options)
         buffer.append(options.inverse());
       }
       return buffer;
+    } else {
+      return options.inverse();
     }
-    return options.buffer();
   }
 
 }

handlebars/src/test/java/com/github/jknack/handlebars/issues/Issue574.java

@@ -0,0 +1,19 @@
+package com.github.jknack.handlebars.issues;
+
+import com.github.jknack.handlebars.v4Test;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+public class Issue574 extends v4Test {
+
+  @Test
+  public void eachShouldExecuteElseBranchOnFalsyValue() throws Exception {
+    shouldCompileTo("{{#each list}}not empty{{else}}empty{{/each}}",
+        $("hash", $("list", Arrays.asList())), "empty");
+
+    shouldCompileTo("{{#each list}}not empty{{else}}empty{{/each}}",
+        $("hash", $("list", null)), "empty");
+  }
+}