From a3ef44b4ba26fee06ee48508433f870937360c9c Mon Sep 17 00:00:00 2001 From: Felix Oghina Date: Mon, 18 Apr 2016 10:00:00 -0700 Subject: [PATCH] throw IllegalArgumentException instead of AssertionError when JS module is not found Reviewed By: astreet Differential Revision: D3190875 fb-gh-sync-id: ac34872d8d36247a8bb28bdfbf985ebcdadd4e33 fbshipit-source-id: ac34872d8d36247a8bb28bdfbf985ebcdadd4e33 --- .../facebook/react/bridge/JavaScriptModuleRegistry.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java index 257321b32..8dd2fd954 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaScriptModuleRegistry.java @@ -59,10 +59,11 @@ public class JavaScriptModuleRegistry { return (T) module; } - JavaScriptModuleRegistration registration = - Assertions.assertNotNull( - mModuleRegistrations.get(moduleInterface), - "JS module " + moduleInterface.getSimpleName() + " hasn't been registered!"); + JavaScriptModuleRegistration registration = mModuleRegistrations.get(moduleInterface); + if (registration == null) { + throw new IllegalArgumentException( + "JS module " + moduleInterface.getSimpleName() + " hasn't been registered!"); + } JavaScriptModule interfaceProxy = (JavaScriptModule) Proxy.newProxyInstance( moduleInterface.getClassLoader(), new Class[]{moduleInterface},