mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Back out "Control concurrent calls into TMMDelegate from TMM"
Summary: Original commit changeset: d22c4abfe87f This synchronization is redundant. See D21025965. Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D21283284 fbshipit-source-id: dae737fe08bbc8f60913baa6c6a58228611257ef
This commit is contained in:
committed by
Facebook GitHub Bot
parent
79bc7f9fad
commit
3d20f49aff
+5
-17
@@ -32,7 +32,7 @@ import java.util.*;
|
||||
*/
|
||||
public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
|
||||
private static volatile boolean sIsSoLibraryLoaded;
|
||||
private final List<String> mEagerInitModuleNames = new ArrayList<>();
|
||||
private final List<String> mEagerInitModuleNames;
|
||||
private final TurboModuleProvider mJavaModuleProvider;
|
||||
private final TurboModuleProvider mCxxModuleProvider;
|
||||
|
||||
@@ -64,11 +64,8 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
|
||||
delegate);
|
||||
installJSIBindings();
|
||||
|
||||
if (delegate != null) {
|
||||
synchronized (delegate) {
|
||||
mEagerInitModuleNames.addAll(delegate.getEagerInitModuleNames());
|
||||
}
|
||||
}
|
||||
mEagerInitModuleNames =
|
||||
delegate == null ? new ArrayList<String>() : delegate.getEagerInitModuleNames();
|
||||
|
||||
mJavaModuleProvider =
|
||||
new TurboModuleProvider() {
|
||||
@@ -78,10 +75,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
|
||||
return null;
|
||||
}
|
||||
|
||||
/** TODO(T65532092): Should TurboModuleManagerDelegate be thread-safe? */
|
||||
synchronized (delegate) {
|
||||
return delegate.getModule(moduleName);
|
||||
}
|
||||
return delegate.getModule(moduleName);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -93,13 +87,7 @@ public class TurboModuleManager implements JSIModule, TurboModuleRegistry {
|
||||
return null;
|
||||
}
|
||||
|
||||
CxxModuleWrapper nativeModule;
|
||||
|
||||
/** TODO(T65532092): Should TurboModuleManagerDelegate be thread-safe? */
|
||||
synchronized (delegate) {
|
||||
nativeModule = delegate.getLegacyCxxModule(moduleName);
|
||||
}
|
||||
|
||||
CxxModuleWrapper nativeModule = delegate.getLegacyCxxModule(moduleName);
|
||||
if (nativeModule != null) {
|
||||
// TurboModuleManagerDelegate must always return TurboModules
|
||||
Assertions.assertCondition(
|
||||
|
||||
Reference in New Issue
Block a user