github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-23 22:00:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Throw NoSuchComponentException with full details in CombinedComponentStorage.get

Browse Source
This commit is contained in:
Him188 2021-06-16 01:52:27 +08:00
parent 9933fab4c5
commit e6119e6301
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mirai-core/src/commonMain/kotlin/network/component/ComponentStorage.kt
View File

@ -53,7 +53,12 @@ private class CombinedComponentStorage(
override val size: Int get() = main.size + fallback.size
override fun <T : Any> get(key: ComponentKey<T>): T {
return main.getOrNull(key) ?: fallback.getOrNull(key) ?: main[key] // let `main` throw exception
return main.getOrNull(key) ?: fallback.getOrNull(key) ?: throw NoSuchComponentException(key, this)
.apply {
//
kotlin.runCatching { main[key] }.exceptionOrNull()?.let(::addSuppressed)
kotlin.runCatching { fallback[key] }.exceptionOrNull()?.let(::addSuppressed)
}
}
override fun <T : Any> getOrNull(key: ComponentKey<T>): T? {