Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix ZIO#timeoutTo inheriting wrong value from FiberRef#locally (#9693) #9700

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2025
Merged

Fix ZIO#timeoutTo inheriting wrong value from FiberRef#locally (#9693) #9700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62053ca
Fix ZIO#timeoutTo inheriting wrong value from FiberRef#locally (#9693)
vladimirkl Mar 15, 2025
c145e8b
use ZIO.never
hearnadam Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions core-tests/shared/src/test/scala/zio/FiberRefSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@ object FiberRefSpec extends ZIOBaseSpec {
value <- fiberRef.get
} yield assert(localValue)(equalTo(update)) && assert(value)(equalTo(initial))
},
test("`locally` restores parent's value after timeout") {
for {
fiberRef <- FiberRef.make(initial)
child <- fiberRef.locally(update)(ZIO.never).timeout(1.second).fork
_ <- TestClock.adjust(1.second)
_ <- child.join
value <- fiberRef.get
} yield assert(value)(equalTo(initial))
},
test("`modify` changes value") {
for {
fiberRef <- FiberRef.make(initial)
Expand Down
6 changes: 3 additions & 3 deletions core/shared/src/main/scala/zio/ZIO.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5603,14 +5603,14 @@ object ZIO extends ZIOCompanionPlatformSpecific with ZIOCompanionVersionSpecific
self.raceFibersWith[R, Nothing, E, Unit, B1](ZIO.sleep(duration).interruptible)(
(winner, loser) =>
winner.await.flatMap { exit =>
winner.inheritAll *> loser.interruptAs(parentFiberId) *> exit.mapExit(f)
loser.interruptAs(parentFiberId) *> winner.inheritAll *> exit.mapExit(f)
},
(winner, loser) =>
winner.await.flatMap {
case e: Exit.Failure[Nothing] =>
loser.inheritAll *> loser.interruptAs(parentFiberId) *> e
loser.interruptAs(parentFiberId) *> loser.inheritAll *> e
case _ =>
loser.inheritAll *> loser.interruptAs(parentFiberId).as(b())
loser.interruptAs(parentFiberId) *> loser.inheritAll.as(b())
},
null,
FiberScope.global
Expand Down
Loading