Merge pull request #919 from pagespeed/oschaaf-trunk-tracking-native-…

…fetcher-pull-755 Call async_fetch_->Done after all usages.
apache · Feb 18, 2015 · bcba22d · bcba22d
2 parents 1ea7e3e + d1f2a43
commit bcba22d
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/ngx_fetch.cc b/src/ngx_fetch.cc
@@ -464,9 +464,6 @@ void NgxFetch::CallbackDone(bool success) {
     connection_ = NULL;
   }
 
-  // TODO(oschaaf): see https://github.com/pagespeed/ngx_pagespeed/pull/755
-  async_fetch_->Done(success);
-
   if (fetcher_ != NULL) {
     if (fetcher_->track_original_content_length()
         && async_fetch_->response_headers()->Has(
@@ -476,7 +473,7 @@ void NgxFetch::CallbackDone(bool success) {
     }
     fetcher_->FetchComplete(this);
   }
-
+  async_fetch_->Done(success);
   async_fetch_ = NULL;
 }