diff options
| author | gene@google.com <gene@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 20:59:51 +0000 |
|---|---|---|
| committer | gene@google.com <gene@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-01 20:59:51 +0000 |
| commit | 46765b1395f7d507bb709ade29f4e2325870fe7e (patch) | |
| tree | f442de4dc1800841bd92b99f301d5daeccafd812 /jingle | |
| parent | fdf773c534a49d14665928b957bbee60d00d0014 (diff) | |
| download | chromium_src-46765b1395f7d507bb709ade29f4e2325870fe7e.zip chromium_src-46765b1395f7d507bb709ade29f4e2325870fe7e.tar.gz chromium_src-46765b1395f7d507bb709ade29f4e2325870fe7e.tar.bz2 | |
Fixed crash during the xmpp reconnection for cloud printing.
BUG=none
TEST=Verify that CP proxy is not crashing when using blocked talk account.
Review URL: http://codereview.chromium.org/4219005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64663 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/listener/push_notifications_thread.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/jingle/notifier/listener/push_notifications_thread.cc b/jingle/notifier/listener/push_notifications_thread.cc index 99a9847..4c927ee 100644 --- a/jingle/notifier/listener/push_notifications_thread.cc +++ b/jingle/notifier/listener/push_notifications_thread.cc @@ -46,6 +46,8 @@ void PushNotificationsThread::SendNotification( void PushNotificationsThread::ListenForPushNotifications() { DCHECK_EQ(MessageLoop::current(), worker_message_loop()); + if (!base_task_.get()) + return; PushNotificationsListenTask* listener = new PushNotificationsListenTask(base_task_, this); listener->Start(); @@ -53,6 +55,9 @@ void PushNotificationsThread::ListenForPushNotifications() { void PushNotificationsThread::SubscribeForPushNotifications( const std::vector<std::string>& subscribed_services_list) { + DCHECK_EQ(MessageLoop::current(), worker_message_loop()); + if (!base_task_.get()) + return; std::vector<PushNotificationsSubscribeTask::PushSubscriptionInfo> channels_list; for (std::vector<std::string>::const_iterator iter = |