Skip to content

Bug 2045937 - Replace FeatureHolder.runBlock with kotlin.concurrent.withLock #7435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
freshstrangemusic merged 1 commit into from
Jun 19, 2026
+7 −15
Merged

Bug 2045937 - Replace FeatureHolder.runBlock with kotlin.concurrent.withLock #7435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 7 additions & 15 deletions ...nts/nimbus/android/src/main/java/org/mozilla/experiments/nimbus/internal/FeatureHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import org.mozilla.experiments.nimbus.HardcodedNimbusFeatures
import org.mozilla.experiments.nimbus.NullVariables
import org.mozilla.experiments.nimbus.Variables
import java.util.concurrent.locks.ReentrantLock
import kotlin.concurrent.withLock

/**
* `FeatureHolder` is a class that unpacks a JSON object from the Nimbus SDK and transforms it into a useful
Expand Down Expand Up @@ -43,7 +44,7 @@ class FeatureHolder<T : FMLFeatureInterface>(
* This can be resolved by setting `FxNimbus.initialize`, and after that by passing in a `Context` object.
*/
fun value(): T =
lock.runBlock {
lock.withLock {
if (cachedValue != null) {
cachedValue!!
} else {
Expand Down Expand Up @@ -105,7 +106,7 @@ class FeatureHolder<T : FMLFeatureInterface>(
* This is most likely useful during testing only.
*/
fun withCachedValue(value: T?) {
lock.runBlock {
lock.withLock {
cachedValue = value
}
}
Expand All @@ -116,7 +117,7 @@ class FeatureHolder<T : FMLFeatureInterface>(
* This is most likely useful during testing and other generated code.
*/
fun withInitializer(create: (Variables, SharedPreferences?) -> T) {
lock.runBlock {
lock.withLock {
this.create = create
this.cachedValue = null
}
Expand All @@ -128,7 +129,7 @@ class FeatureHolder<T : FMLFeatureInterface>(
* This is especially useful at start up and for imported features.
*/
fun withSdk(getSdk: () -> FeaturesInterface?) {
lock.runBlock {
lock.withLock {
this.getSdk = getSdk
this.cachedValue = null
}
Expand Down Expand Up @@ -165,19 +166,10 @@ class FeatureHolder<T : FMLFeatureInterface>(
* For example, a background worker might be scheduled to run every 24 hours, but
* under test it would be desirable to run immediately, and only once.
*/
fun isUnderTest(): Boolean = lock.runBlock {
val sdk = getSdk() as? HardcodedNimbusFeatures ?: return@runBlock false
fun isUnderTest(): Boolean = lock.withLock {
val sdk = getSdk() as? HardcodedNimbusFeatures ?: return@withLock false
sdk.hasFeature(featureId)
}

private fun <T> ReentrantLock.runBlock(block: () -> T): T {
lock.lock()
try {
return block.invoke()
} finally {
lock.unlock()
}
}
}

class NimbusFeatureException(message: String) : Exception(message)
Expand Down