IO: fix race in closeWaitJob of JoiningState

Sergey Mashkov · Sergey Mashkov · commit 47d92bafe90d · 2017-11-17T19:30:22.000+03:00
diff --git a/core/kotlinx-coroutines-io/src/main/kotlin/kotlinx/coroutines/experimental/io/ByteBufferChannel.kt b/core/kotlinx-coroutines-io/src/main/kotlin/kotlinx/coroutines/experimental/io/ByteBufferChannel.kt
@@ -1973,7 +1973,10 @@ internal class ByteBufferChannel(
                     val current = _closeWaitJob.value
                     if (current != null) return current
                     val newJob = Job()
-                    if (_closeWaitJob.compareAndSet(null, newJob)) return newJob
+                    if (_closeWaitJob.compareAndSet(null, newJob)) {
+                        if (closed.value == 1) newJob.cancel()
+                        return newJob
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -1973,7 +1973,10 @@ internal class ByteBufferChannel(`
`1973`	`1973`	`val current = _closeWaitJob.value`
`1974`	`1974`	`if (current != null) return current`
`1975`	`1975`	`val newJob = Job()`
`1976`		`- if (_closeWaitJob.compareAndSet(null, newJob)) return newJob`
	`1976`	`+ if (_closeWaitJob.compareAndSet(null, newJob)) {`
	`1977`	`+ if (closed.value == 1) newJob.cancel()`
	`1978`	`+ return newJob`
	`1979`	`+ }`
`1977`	`1980`	`}`
`1978`	`1981`	`}`
`1979`	`1982`