Make Closeable.use call addSuppressed
Call addSuppressed when it's provided by the supplementary artifact for jdk7, and only when targeting apiVersion > 1.1 #KT-18961 Fixed
This commit is contained in:
@@ -60,7 +60,6 @@ class TryWithResourcesCloseableTest {
|
||||
assertTrue(e.suppressed.isEmpty())
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test fun opFailsCloseFails() {
|
||||
val e = assertFails {
|
||||
Resource(faultyClose = true).use { error("op fail") }
|
||||
@@ -69,7 +68,6 @@ class TryWithResourcesCloseableTest {
|
||||
assertTrue(e.suppressed.single() is IOException)
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test fun opFailsCloseFailsTwice() {
|
||||
val e = assertFails {
|
||||
Resource(faultyClose = true).use { _ ->
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package kotlin.jdk7.test
|
||||
package test.jdk7
|
||||
|
||||
import org.junit.Ignore
|
||||
import java.io.*
|
||||
@@ -60,7 +60,6 @@ class TryWithResourcesCloseableTest {
|
||||
assertTrue(e.suppressed.isEmpty())
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test fun opFailsCloseFails() {
|
||||
val e = assertFails {
|
||||
Resource(faultyClose = true).use { error("op fail") }
|
||||
@@ -69,7 +68,6 @@ class TryWithResourcesCloseableTest {
|
||||
assertTrue(e.suppressed.single() is IOException)
|
||||
}
|
||||
|
||||
@Ignore
|
||||
@Test fun opFailsCloseFailsTwice() {
|
||||
val e = assertFails {
|
||||
Resource(faultyClose = true).use { _ ->
|
||||
|
||||
@@ -30,19 +30,23 @@ import kotlin.internal.*
|
||||
*/
|
||||
@InlineOnly
|
||||
public inline fun <T : Closeable?, R> T.use(block: (T) -> R): R {
|
||||
var closed = false
|
||||
var exception: Throwable? = null
|
||||
try {
|
||||
return block(this)
|
||||
} catch (e: Exception) {
|
||||
closed = true
|
||||
try {
|
||||
this?.close()
|
||||
} catch (closeException: Exception) {
|
||||
}
|
||||
} catch (e: Throwable) {
|
||||
exception = e
|
||||
throw e
|
||||
} finally {
|
||||
if (!closed) {
|
||||
this?.close()
|
||||
when {
|
||||
apiVersionIsAtLeast(1, 1, 0) -> this.closeFinally(exception)
|
||||
this == null -> {}
|
||||
exception == null -> close()
|
||||
else ->
|
||||
try {
|
||||
close()
|
||||
} catch (closeException: Throwable) {
|
||||
// cause.addSuppressed(closeException) // ignored here
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user