From 2f9d94418d55cf8cd1dc9e66ddbed909e8d9d8cb Mon Sep 17 00:00:00 2001 From: Rick Hanlon Date: Wed, 29 Jan 2020 04:27:57 -0800 Subject: [PATCH] Don't log for unavailable modules during reload Summary: Removes logging for known invalid states. Changelog: [Internal] Reviewed By: sammy-SC Differential Revision: D18966536 fbshipit-source-id: 483dce1d2bf0c6c92458f618789cf98dcf92ee97 --- React/CxxBridge/RCTCxxBridge.mm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index 29d86e144d0..78d83968c22 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -485,19 +485,22 @@ struct RCTInstanceCallback : public InstanceCallback { return moduleData.instance; } - static NSSet *ignoredModuleLoadFailures = [NSSet setWithArray: @[@"UIManager"]]; - // Module may not be loaded yet, so attempt to force load it here. const BOOL result = [self.delegate respondsToSelector:@selector(bridge:didNotFindModule:)] && [self.delegate bridge:self didNotFindModule:moduleName]; if (result) { // Try again. moduleData = _moduleDataByName[moduleName]; - } else if ([ignoredModuleLoadFailures containsObject: moduleName]) { - RCTLogWarn(@"Unable to find module for %@", moduleName); +#if RCT_DEV + // If the `_moduleDataByName` is nil, it must have been cleared by the reload. + } else if (_moduleDataByName != nil) { + RCTLogError(@"Unable to find module for %@", moduleName); + } +#else } else { RCTLogError(@"Unable to find module for %@", moduleName); } +#endif return moduleData.instance; }