Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	docs/flow.md
  • Loading branch information
qwwdfsad committed Dec 12, 2019
2 parents 41dca58 + 344e932 commit 7abce10
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ to Gradle (in Preferences -> Build, Execution, Deployment -> Build Tools -> Grad

### Requirements

* JDK >= 1.8 referred to by the `JAVA_HOME` environment variable.
* JDK >= 1.8 referred to by the `JAVA_HOME` environment variable. JDK must include JavaFX.
* JDK 1.6 referred to by the `JDK_16` environment variable. It is okay to have `JDK_16` pointing to `JAVA_HOME` for external contributions.

## Contributions and releases
Expand Down
5 changes: 2 additions & 3 deletions docs/exception-handling.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,7 @@ Caught java.lang.AssertionError
Cancellation is tightly bound with exceptions. Coroutines internally use `CancellationException` for cancellation, these
exceptions are ignored by all handlers, so they should be used only as the source of additional debug information, which can
be obtained by `catch` block.
When a coroutine is cancelled using [Job.cancel] without a cause, it terminates, but it does not cancel its parent.
Cancelling without cause is a mechanism for parent to cancel its children without cancelling itself.
When a coroutine is cancelled using [Job.cancel], it terminates, but it does not cancel its parent.

<div class="sample" markdown="1" theme="idea" data-min-compiler-version="1.3">

Expand Down Expand Up @@ -189,7 +188,7 @@ Parent is not cancelled

<!--- TEST-->

If a coroutine encounters exception other than `CancellationException`, it cancels its parent with that exception.
If a coroutine encounters an exception other than `CancellationException`, it cancels its parent with that exception.
This behaviour cannot be overridden and is used to provide stable coroutines hierarchies for
[structured concurrency](https://github.com/Kotlin/kotlinx.coroutines/blob/master/docs/composing-suspending-functions.md#structured-concurrency-with-async) which do not depend on
[CoroutineExceptionHandler] implementation.
Expand Down
5 changes: 5 additions & 0 deletions kotlinx-coroutines-core/jvm/src/Dispatchers.kt
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ public actual object Dispatchers {
* "`kotlinx.coroutines.io.parallelism`" ([IO_PARALLELISM_PROPERTY_NAME]) system property.
* It defaults to the limit of 64 threads or the number of cores (whichever is larger).
*
* Moreover, the maximum configurable number of threads is capped by the
* `kotlinx.coroutines.scheduler.max.pool.size` system property.
* If you need a higher number of parallel threads,
* you should use a custom dispatcher backed by your own thread pool.
*
* This dispatcher shares threads with a [Default][Dispatchers.Default] dispatcher, so using
* `withContext(Dispatchers.IO) { ... }` does not lead to an actual switching to another thread &mdash;
* typically execution continues in the same thread.
Expand Down

0 comments on commit 7abce10

Please sign in to comment.