* [android] Fix alibaba/weex#1200 . Revert commit 2b54731

sospartan · Nov 15, 2016 · 605fd25 · 605fd25
1 parent 7c24a08
commit 605fd25
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -435,13 +435,9 @@ public void post(Runnable r, Object token) {
       return;
     }
 
-    if (isJSThread() && r != null) {
-      r.run();
-    } else {
-      Message m = Message.obtain(mJSHandler, WXThread.secure(r));
-      m.obj = token;
-      m.sendToTarget();
-    }
+    Message m = Message.obtain(mJSHandler, WXThread.secure(r));
+    m.obj = token;
+    m.sendToTarget();
   }
 
   void setTimeout(String callbackId, String time) {
@@ -1132,16 +1128,19 @@ private void execRegisterFailTask() {
    */
 
   public void registerModules(final Map<String, Object> modules) {
-    if ( mJSHandler == null || modules == null
-        || modules.size() == 0) {
-      return;
-    }
-    post(new Runnable() {
-      @Override
-      public void run() {
+    if (modules != null && modules.size() != 0) {
+      if(isJSThread()){
         invokeRegisterModules(modules);
       }
-    }, null);
+      else{
+        post(new Runnable() {
+          @Override
+          public void run() {
+            invokeRegisterModules(modules);
+          }
+        }, null);
+      }
+    }
   }
 
   /**