fixed test

zio · Mar 9, 2022 · 6769251 · 6769251 · github-actions · Mar 9, 2022
1 parent 02c72ff
commit 6769251
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/zio-http/src/main/scala/zhttp/http/Http.scala b/zio-http/src/main/scala/zhttp/http/Http.scala
@@ -4,6 +4,7 @@ import io.netty.buffer.{ByteBuf, ByteBufUtil}
 import io.netty.channel.ChannelHandler
 import io.netty.handler.codec.http.HttpHeaderNames
 import zhttp.html._
+import zhttp.http.HExit.Effect
 import zhttp.http.headers.HeaderModifier
 import zhttp.service.server.ServerTime
 import zhttp.service.{Handler, HttpRuntime, Server}
@@ -599,8 +600,19 @@ sealed trait Http[-R, +E, -A, +B] extends (A => ZIO[R, Option[E], B]) { self =>
 
       case Combine(self, other) => {
         self.execute(a) match {
-          case HExit.Empty => other.execute(a)
-          case u           => u.asInstanceOf[HExit[R, E, B]]
+          case HExit.Effect(zio) => {
+            Effect(
+              zio.foldM(
+                {
+                  case Some(error) => ZIO.fail(Option(error.asInstanceOf[E]))
+                  case None        => other.execute(a).toZIO
+                },
+                b => ZIO.succeed(b.asInstanceOf[B]),
+              ),
+            )
+          }
+          case HExit.Empty       => other.execute(a)
+          case u                 => u.asInstanceOf[HExit[R, E, B]]
         }
       }
     }