From 7c82803c4d276f4abb0ccb67917a3f4b5eb90b32 Mon Sep 17 00:00:00 2001
From: Aaron Chiu <aaronechiu@fb.com>
Date: Mon, 13 Feb 2017 20:22:14 -0800
Subject: [PATCH] clean up ModuleHolder.java

Reviewed By: achen1

Differential Revision: D4548524

fbshipit-source-id: 5fab273e7a461c0312fa555aaccb8869843d9d95
---
 .../react/cxxbridge/ModuleHolder.java         | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
index 1d194e776c..f32d35c128 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ModuleHolder.java
@@ -48,7 +48,7 @@ public class ModuleHolder {
     mSupportsWebWorkers = supportsWebWorkers;
     mProvider = provider;
     if (needsEagerInit) {
-      mModule = doCreate();
+      mModule = create();
     }
   }
 
@@ -91,34 +91,25 @@ public class ModuleHolder {
 
   public synchronized NativeModule getModule() {
     if (mModule == null) {
-      mModule = doCreate();
+      mModule = create();
     }
     return mModule;
   }
 
-  private NativeModule doCreate() {
-    NativeModule module = create();
-    mProvider = null;
-    return module;
-  }
-
   private NativeModule create() {
-    boolean isEagerModule = mModule != null;
-    if (!isEagerModule) {
-      ReactMarker.logMarker(CREATE_MODULE_START, mName);
-    }
+    SoftAssertions.assertCondition(mModule == null, "Creating an already created module.");
+    ReactMarker.logMarker(CREATE_MODULE_START, mName);
     SystraceMessage.beginSection(TRACE_TAG_REACT_JAVA_BRIDGE, "createModule")
       .arg("name", mName)
       .flush();
     NativeModule module = assertNotNull(mProvider).get();
+    mProvider = null;
     if (mInitializeNeeded) {
       doInitialize(module);
       mInitializeNeeded = false;
     }
     Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
-    if (!isEagerModule) {
-      ReactMarker.logMarker(CREATE_MODULE_END);
-    }
+    ReactMarker.logMarker(CREATE_MODULE_END);
     return module;
   }