azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Provide ThreadLocalRandom wrapper only on JDK8 as it is buggy in JDK7

Browse Source
This commit is contained in:
Ilya Gorbunov
2018-07-04 06:36:09 +03:00
parent 870f5e3448
commit 042a8ff6a2
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jdk7/src/kotlin/internal/jdk7/JDK7PlatformImplementations.kt
-4
View File
@@ -18,13 +18,9 @@
package kotlin.internal.jdk7
import kotlin.internal.PlatformImplementations
import kotlin.random.Random
import kotlin.random.jdk7.PlatformThreadLocalRandom
internal open class JDK7PlatformImplementations : PlatformImplementations() {
override fun addSuppressed(cause: Throwable, exception: Throwable) = cause.addSuppressed(exception)
override fun defaultPlatformRandom(): Random = PlatformThreadLocalRandom()
}
libraries/stdlib/jdk7/src/kotlin/random/jdk7/PlatformThreadLocalRandom.kt
-19
View File
@@ -1,19 +0,0 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package kotlin.random.jdk7
import java.util.concurrent.ThreadLocalRandom
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "CANNOT_OVERRIDE_INVISIBLE_MEMBER")
internal class PlatformThreadLocalRandom : kotlin.random.AbstractPlatformRandom() {
override val impl: ThreadLocalRandom get() = ThreadLocalRandom.current()
override fun nextInt(origin: Int, bound: Int): Int = impl.nextInt(origin, bound)
override fun nextLong(bound: Long): Long = impl.nextLong(bound)
override fun nextLong(origin: Long, bound: Long): Long = impl.nextLong(origin, bound)
override fun nextDouble(bound: Double): Double = impl.nextDouble(bound)
override fun nextDouble(origin: Double, bound: Double): Double = impl.nextDouble(origin, bound)
}
libraries/stdlib/jdk8/src/kotlin/internal/jdk8/JDK8PlatformImplementations.kt
+4
View File
@@ -21,6 +21,8 @@ import java.util.regex.MatchResult
import java.util.regex.Matcher
import kotlin.internal.PlatformImplementations
import kotlin.internal.jdk7.JDK7PlatformImplementations
import kotlin.random.Random
import kotlin.random.jdk8.PlatformThreadLocalRandom
internal open class JDK8PlatformImplementations : JDK7PlatformImplementations() {
@@ -34,4 +36,6 @@ internal open class JDK8PlatformImplementations : JDK7PlatformImplementations()
null
}
override fun defaultPlatformRandom(): Random = PlatformThreadLocalRandom()
}
libraries/stdlib/jdk8/src/kotlin/random/jdk8/PlatformThreadLocalRandom.kt
+20
View File
@@ -0,0 +1,20 @@
/*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
* that can be found in the license/LICENSE.txt file.
*/
package kotlin.random.jdk8
import java.util.concurrent.ThreadLocalRandom
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "CANNOT_OVERRIDE_INVISIBLE_MEMBER")
internal class PlatformThreadLocalRandom : kotlin.random.AbstractPlatformRandom() {
// TODO no bridge generated for covariant override
override val impl: java.util.Random get() = ThreadLocalRandom.current()
override fun nextInt(origin: Int, bound: Int): Int = ThreadLocalRandom.current().nextInt(origin, bound)
override fun nextLong(bound: Long): Long = ThreadLocalRandom.current().nextLong(bound)
override fun nextLong(origin: Long, bound: Long): Long = ThreadLocalRandom.current().nextLong(origin, bound)
override fun nextDouble(bound: Double): Double = ThreadLocalRandom.current().nextDouble(bound)
override fun nextDouble(origin: Double, bound: Double): Double = ThreadLocalRandom.current().nextDouble(origin, bound)
}