Avoid double evaluation of by-name parameter in Stream.fromChunk cons…

…tructor (zio#6757)
IMax153 · May 2, 2022 · 39322c7 · 39322c7
1 parent 5e56f0e
commit 39322c7
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/streams/shared/src/main/scala/zio/stream/ZStream.scala b/streams/shared/src/main/scala/zio/stream/ZStream.scala
@@ -3764,8 +3764,16 @@ object ZStream extends ZStreamPlatformSpecificConstructors {
       for {
         doneRef <- Ref.make(false).toManaged_
         pull = doneRef.modify { done =>
-                 if (done || c.isEmpty) Pull.end -> true
-                 else ZIO.succeedNow(c)          -> true
+                 if (done) {
+                   Pull.end -> true
+                 } else {
+                   val c0 = c
+                   if (c0.isEmpty) {
+                     Pull.end -> true
+                   } else {
+                     ZIO.succeedNow(c0) -> true
+                   }
+                 }
                }.flatten
       } yield pull
     }