Make RCTNativeModule::invokeInner explicitely return folly::none in c…

…ase of error Differential Revision: D6347967 fbshipit-source-id: 88788da321ca75d20b6c1a8e3d41642af7c6155e
facebook · Nov 17, 2017 · 0ac5a52 · 0ac5a52
1 parent d19d137
commit 0ac5a52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/React/Base/RCTAssert.m b/React/Base/RCTAssert.m
@@ -131,7 +131,7 @@ void RCTFatal(NSError *error)
 #endif
       NSString *name = [NSString stringWithFormat:@"%@: %@", RCTFatalExceptionName, error.localizedDescription];
       NSString *message = RCTFormatError(error.localizedDescription, error.userInfo[RCTJSStackTraceKey], 75);
-      [NSException raise:name format:@"%@", message];
+      @throw [[NSException alloc]  initWithName:name reason:message userInfo:nil];
 #if DEBUG
     } @catch (NSException *e) {}
 #endif

diff --git a/React/CxxModule/RCTNativeModule.mm b/React/CxxModule/RCTNativeModule.mm
@@ -112,6 +112,8 @@ static MethodCallResult invokeInner(RCTBridge *bridge, RCTModuleData *moduleData
                          exception, method.JSMethodName, moduleData.name, objcParams, exception.callStackSymbols];
     RCTFatal(RCTErrorWithMessage(message));
   }
+
+  return folly::none;
 }
 
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                              exception, method.JSMethodName, moduleData.name, objcParams, exception.callStackSymbols];
         RCTFatal(RCTErrorWithMessage(message));
       }
+      return folly::none;
     }
     }
@@ Expand Down @@