Fix NPE in cancelling network calls

Summary: Issue reported here facebook#7755 (comment) Converting int to Integer explicitly and not cancelling the call more than once should fix it. Reviewed By: bestander Differential Revision: D3371238 fbshipit-source-id: cb00663b4ca19a788bd27b971b6447cc0788a818
clows · Jun 3, 2016 · 5de1151 · 5de1151
1 parent 8fe5884
commit 5de1151
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java b/ReactAndroid/src/main/java/com/facebook/react/common/network/OkHttpCallUtil.java
@@ -24,11 +24,13 @@ public static void cancelTag(OkHttpClient client, Object tag) {
     for (Call call : client.dispatcher().queuedCalls()) {
       if (tag.equals(call.request().tag())) {
         call.cancel();
+        return;
       }
     }
     for (Call call : client.dispatcher().runningCalls()) {
       if (tag.equals(call.request().tag())) {
         call.cancel();
+        return;
       }
     }
   }

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
@@ -384,7 +384,7 @@ private void cancelRequest(final int requestId) {
     new GuardedAsyncTask<Void, Void>(getReactApplicationContext()) {
       @Override
       protected void doInBackgroundGuarded(Void... params) {
-        OkHttpCallUtil.cancelTag(mClient, requestId);
+        OkHttpCallUtil.cancelTag(mClient, Integer.valueOf(requestId));
       }
     }.execute();
   }