diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt index 764dec3d0fb..f0b170b2e06 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.kt @@ -20,21 +20,49 @@ import kotlin.jvm.JvmStatic @DoNotStrip public open class ReadableNativeArray protected constructor() : NativeArray(), ReadableArray { - private val localArray: Array by - lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - jniPassCounter++ - importArray() + private var localArrayStorage: Array? = null + private val localArray: Array + get() { + var localArray = localArrayStorage + if (localArray != null) { + return localArray } + synchronized(this) { + // Check again with the lock held to prevent duplicate construction + localArray = localArrayStorage + if (localArray == null) { + localArray = importArray() + localArrayStorage = localArray + jniPassCounter++ + } + return localArray + } + } + private external fun importArray(): Array - private val localTypeArray: Array by - lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - jniPassCounter++ - val tempArray = importTypeArray() - Arrays.copyOf(tempArray, tempArray.size, Array::class.java) + private var localTypeArrayStorage: Array? = null + private val localTypeArray: Array + get() { + var localTypeArray = localTypeArrayStorage + if (localTypeArray != null) { + return localTypeArray } + synchronized(this) { + // Check again with the lock held to prevent duplicate construction + localTypeArray = localTypeArrayStorage + if (localTypeArray == null) { + val tempArray = importTypeArray() + localTypeArray = Arrays.copyOf(tempArray, tempArray.size, Array::class.java) + localTypeArrayStorage = localTypeArray + jniPassCounter++ + } + return localTypeArray + } + } + private external fun importTypeArray(): Array override fun size(): Int = localArray.size diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.kt index 7f943654369..2f47805fb9b 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.kt @@ -17,32 +17,76 @@ import com.facebook.proguard.annotations.DoNotStripAny */ @DoNotStripAny public open class ReadableNativeMap protected constructor() : NativeMap(), ReadableMap { - private val keys: Array by - lazy(LazyThreadSafetyMode.SYNCHRONIZED) { importKeys().also { jniPassCounter++ } } - - private val localMap: HashMap by - lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - val length = keys.size - val res = HashMap(length) - val values = importValues() - jniPassCounter++ - for (i in 0 until length) { - res[keys[i]] = values[i] - } - res + private var keysStorage: Array? = null + private val keys: Array + get() { + var keys = keysStorage + if (keys != null) { + return keys } - private val localTypeMap: HashMap by - lazy(LazyThreadSafetyMode.SYNCHRONIZED) { - val length = keys.size - val res = HashMap(length) - val types = importTypes() - jniPassCounter++ - for (i in 0 until length) { - res[keys[i]] = types[i] as ReadableType + synchronized(this) { + // Check again with the lock held to prevent duplicate construction + keys = keysStorage + if (keys == null) { + keys = importKeys() + keysStorage = keys + jniPassCounter++ } - res + return keys } + } + + private var localMapStorage: Map? = null + private val localMap: Map + get() { + var localMap = localMapStorage + if (localMap != null) { + return localMap + } + + synchronized(this) { + // Check again with the lock held to prevent duplicate construction + localMap = localMapStorage + if (localMap == null) { + val keys = keys + val length = keys.size + localMap = HashMap() + val values = importValues() + for (i in 0 until length) { + localMap[keys[i]] = values[i] + } + localMapStorage = localMap + jniPassCounter++ + } + return localMap + } + } + + private var localTypeMapStorage: Map? = null + private val localTypeMap: Map + get() { + var localTypeMap = localTypeMapStorage + if (localTypeMap != null) { + return localTypeMap + } + + synchronized(this) { + // Check again with the lock held to prevent duplicate construction + localTypeMap = localTypeMapStorage + if (localTypeMap == null) { + val keys = keys + localTypeMap = HashMap() + val types = importTypes() + for (i in 0 until keys.size) { + localTypeMap[keys[i]] = types[i] as ReadableType + } + localTypeMapStorage = localTypeMap + jniPassCounter++ + } + return localTypeMap + } + } private external fun importKeys(): Array @@ -76,7 +120,7 @@ public open class ReadableNativeMap protected constructor() : NativeMap(), Reada private inline fun getValue(name: String, type: Class): T = checkInstance(name, getValue(name), type) - private fun getNullableValue(name: String): Any? = localMap.get(name) + private fun getNullableValue(name: String): Any? = localMap[name] private inline fun getNullableValue(name: String, type: Class): T? { val res = getNullableValue(name) @@ -110,36 +154,29 @@ public open class ReadableNativeMap protected constructor() : NativeMap(), Reada override fun getDynamic(name: String): Dynamic = DynamicFromMap.create(this, name) override val entryIterator: Iterator> - get() = - synchronized(this) { - val iteratorKeys = keys - val iteratorValues = importValues() - jniPassCounter++ - return object : Iterator> { - var currentIndex = 0 + get() { + val iteratorKeys = keys + val iteratorValues = importValues() + jniPassCounter++ + return object : Iterator> { + var currentIndex = 0 - override fun hasNext(): Boolean { - return currentIndex < iteratorKeys.size - } + override fun hasNext(): Boolean { + return currentIndex < iteratorKeys.size + } - override fun next(): Map.Entry { - val index = currentIndex++ - return object : MutableMap.MutableEntry { - override val key: String - get() = iteratorKeys[index] + override fun next(): Map.Entry { + val index = currentIndex++ + return object : Map.Entry { + override val key: String + get() = iteratorKeys[index] - override val value: Any - get() = iteratorValues[index] - - override fun setValue(newValue: Any): Any { - throw UnsupportedOperationException( - "Can't set a value while iterating over a ReadableNativeMap" - ) - } - } - } + override val value: Any + get() = iteratorValues[index] } } + } + } override fun keySetIterator(): ReadableMapKeySetIterator { val iteratorKeys = keys