cashew: Service: set "in progress" flag before requesting usage update

src/service.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/service.h"
 
 #include <glog/logging.h>
 
 #include "src/data_plan_provider.h"
 #include "src/device.h"
@@ skipping 478 matching lines @@
          device_->GetCarrier().compare(Device::kCarrierUnknown));
 
   if (request_in_progress_) {
     return;
   }
 
   // TODO(vlaviano): apply policy to determine if current connectivity state
   // allows this request (e.g., if we can only make API requests over the
   // cellular service itself, is this service the default route?)
 
+  request_in_progress_ = true;
   if (!provider_->RequestUsageUpdate()) {
     DLOG(WARNING) << path_ << ": RequestUsageUpdate: request failed";
+    request_in_progress_ = false;
   } else {
     DLOG(INFO) << path_ << ": RequestUsageUpdate: request succeeded";
-    request_in_progress_ = true;
   }
 }
 
 void Service::CancelPendingRequests() {
   if (provider_ != NULL && request_in_progress_) {
     provider_->CancelPendingRequests();
     request_in_progress_ = false;
   }
 }
 
@@ skipping 48 matching lines @@
   DestroyUpdateTimer();
   CancelPendingRequests();
   if (provider_ != NULL) {
     DLOG(INFO) << path_ << ": DeleteCarrierState: deleting data plan provider";
     delete provider_;
     provider_ = NULL;
   }
 }
 
 }  // namespace cashew