Better handling exception in loadScript()

dcaspi · facebook-github-bot · commit 3fbf7856d9ac · 2018-01-31T05:31:12.000-08:00
Differential Revision: D6856807

fbshipit-source-id: 36c527ee00eef56a5912ad6e4233d6cd61cb5170
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/FallbackJSBundleLoader.java
@@ -57,7 +57,7 @@ public String loadScript(CatalystInstanceImpl instance) {
       try {
         return getDelegateLoader().loadScript(instance);
       } catch (Exception e) {
-        if (!e.getMessage().startsWith(RECOVERABLE)) {
+        if (e.getMessage() == null || !e.getMessage().startsWith(RECOVERABLE)) {
           throw e;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public String loadScript(CatalystInstanceImpl instance) {`
`57`	`57`	`try {`
`58`	`58`	`return getDelegateLoader().loadScript(instance);`
`59`	`59`	`} catch (Exception e) {`
`60`		`- if (!e.getMessage().startsWith(RECOVERABLE)) {`
	`60`	`+ if (e.getMessage() == null \|\| !e.getMessage().startsWith(RECOVERABLE)) {`
`61`	`61`	`throw e;`
`62`	`62`	`}`
`63`	`63`