Merge pull request functionaljava#38 from gneuvill/fjmaster

runarorama · runarorama · commit 2ca5e499eb04 · 2014-01-21T10:07:16.000-08:00
Fixes functionaljava#37.
diff --git a/core/src/main/java/fj/data/TreeZipper.java b/core/src/main/java/fj/data/TreeZipper.java
@@ -276,9 +276,10 @@ public Option<TreeZipper<A>> findChild(final F<Tree<A>, Boolean> p) {
         new F2<Stream<Tree<A>>, Stream<Tree<A>>, Option<P3<Stream<Tree<A>>, Tree<A>, Stream<Tree<A>>>>>() {
           public Option<P3<Stream<Tree<A>>, Tree<A>, Stream<Tree<A>>>> f(final Stream<Tree<A>> acc,
                                                                          final Stream<Tree<A>> xs) {
-            return p.f(xs.head()) ? some(P.p(acc, xs.head(), xs.tail()._1()))
-                                  : xs.isNotEmpty() ? f(acc.cons(xs.head()), xs.tail()._1())
-                                                    : Option.<P3<Stream<Tree<A>>, Tree<A>, Stream<Tree<A>>>>none();
+            return xs.isNotEmpty()
+                     ? p.f(xs.head()) ? some(P.p(acc, xs.head(), xs.tail()._1()))
+                                      : f(acc.cons(xs.head()), xs.tail()._1())
+                     : Option.<P3<Stream<Tree<A>>, Tree<A>, Stream<Tree<A>>>>none();
           }
         };
 
