Merge lp:~boiko/history-service/fix_participants_on_call_ended into lp:history-service

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Tiago Salem Herrmann
Approved revision: 196
Merged at revision: 207
Proposed branch: lp:~boiko/history-service/fix_participants_on_call_ended
Merge into: lp:history-service
Diff against target: 16 lines (+6/-0)
1 file modified
daemon/historydaemon.cpp (+6/-0)
To merge this branch: bzr merge lp:~boiko/history-service/fix_participants_on_call_ended
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+260402@code.launchpad.net

Commit message

Prevent the history-daemon from crashing in the event of an ended call not having any remote member.

Description of the change

Prevent the history-daemon from crashing in the event of an ended call not having any remote member.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

changing the status to see if it can make CI give it a retry

196. By Gustavo Pichorim Boiko

Merge trunk.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Tiago Salem Herrmann (tiagosh) wrote :

Looks good. thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'daemon/historydaemon.cpp'
2--- daemon/historydaemon.cpp 2015-04-01 20:05:39 +0000
3+++ daemon/historydaemon.cpp 2015-08-18 18:14:31 +0000
4@@ -334,6 +334,12 @@
5 participants << contact->id();
6 }
7
8+ // it shouldn't happen, but in case it does, we won't crash
9+ if (participants.isEmpty()) {
10+ qWarning() << "Participants list was empty for call channel" << channel;
11+ return;
12+ }
13+
14 QString accountId = channel->property(History::FieldAccountId).toString();
15 QVariantMap thread = threadForParticipants(accountId,
16 History::EventTypeVoice,

Subscribers

People subscribed via source and target branches