Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / google_apis / gcm / engine / connection_factory_impl.cc

diff --git a/src/google_apis/gcm/engine/connection_factory_impl.cc b/src/google_apis/gcm/engine/connection_factory_impl.cc
index 9dff1f6..b98a629 100644 (file)
--- a/src/google_apis/gcm/engine/connection_factory_impl.cc
+++ b/src/google_apis/gcm/engine/connection_factory_impl.cc
@@ -106,7 +106,7 @@ void ConnectionFactoryImpl::Connect() {
 void ConnectionFactoryImpl::ConnectWithBackoff() {
   // If a canary managed to connect while a backoff expiration was pending,
   // just cleanup the internal state.
-  if (connecting_ || IsEndpointReachable()) {
+  if (connecting_ || logging_in_ || IsEndpointReachable()) {
     waiting_for_backoff_ = false;
     return;
   }