From 6b64dcc4eea1b974e48a4c34fdeb9b4ffd150532 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 18 May 2015 18:25:41 +0300 Subject: [PATCH] JvmProtoBuf: reuse one instance of ExtensionRegistryLite --- .../serialization/jvm/JvmProtoBufUtil.kt | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt index 97afa794ea3..5b47d4c4b8d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/serialization/jvm/JvmProtoBufUtil.kt @@ -22,25 +22,19 @@ import org.jetbrains.kotlin.serialization.PackageData import kotlin.platform.platformStatic public object JvmProtoBufUtil { - - public fun getExtensionRegistry(): ExtensionRegistryLite { + public val EXTENSION_REGISTRY: ExtensionRegistryLite = run { val registry = ExtensionRegistryLite.newInstance() JvmProtoBuf.registerAllExtensions(registry) - return registry + registry } platformStatic - public fun readClassDataFrom(encodedData: Array): ClassData { - return ClassData.read(BitEncoding.decodeBytes(encodedData), getExtensionRegistry()) - } + public fun readClassDataFrom(encodedData: Array): ClassData = + ClassData.read(BitEncoding.decodeBytes(encodedData), EXTENSION_REGISTRY) platformStatic - public fun readPackageDataFrom(encodedData: Array): PackageData { - return readPackageDataFrom(BitEncoding.decodeBytes(encodedData)) - } + public fun readPackageDataFrom(encodedData: Array): PackageData = readPackageDataFrom(BitEncoding.decodeBytes(encodedData)) platformStatic - public fun readPackageDataFrom(data: ByteArray): PackageData { - return PackageData.read(data, getExtensionRegistry()) - } + public fun readPackageDataFrom(data: ByteArray): PackageData = PackageData.read(data, EXTENSION_REGISTRY) }