Fix interrupting taking a cell completed while selecting with a defau…

…lt clause
softwaremill · Aug 26, 2023 · 875796b · 875796b
1 parent 52bdcf5
commit 875796b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/main/scala/ox/channels/select.scala b/core/src/main/scala/ox/channels/select.scala
@@ -88,7 +88,10 @@ private def doSelect[T](clauses: List[SelectClause[T]]): SelectResult[T] | Chann
  case (ChannelClosed.Done, false) => DefaultResult(d.value)
  case (e: ChannelClosed.Error, _) => e
  case false => DefaultResult(d.value)
- case true => takeFromCellInterruptSafe(c, Nil) // the cell hasn't been offered to any channel
+ case true =>
+ // the cell has been satisfied, it shouldn't yet be owned; owning it in case take() is interrupted
+ if !c.tryOwn() then throw IllegalStateException()
+ takeFromCellInterruptSafe(c, Nil) // the cell hasn't been offered to any channel
 
 //