Skip to content

Commit 31b57ad

Browse files
Update kotlinx-coroutines-core/jvm/src/ThreadContextElement.kt
Co-authored-by: dkhalanskyjb <[email protected]>
1 parent ff5083b commit 31b57ad

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

kotlinx-coroutines-core/jvm/src/ThreadContextElement.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,11 @@ public interface ThreadContextElement<S> : CoroutineContext.Element {
120120
*
121121
* override fun mergeForChild(overwritingElement: CoroutineContext.Element): CoroutineContext
122122
* // Merge operation defines how to handle situation when both
123-
* // parent coroutine has the element in the context and it was also
124-
* // explicitly passed to a child coroutine.
125-
* // If merge is not defined, the copy of the element can be returned.
123+
* // the parent coroutine has an element in the context and
124+
* // an element with the same key was also
125+
* // explicitly passed to the child coroutine.
126+
* // If merging does not require special behavior,
127+
* // the copy of the element can be returned.
126128
* return TraceContextElement(traceThreadLocal.get()?.copy())
127129
* }
128130
* }

0 commit comments

Comments
 (0)