Media Hub

Merge lp://staging/~phablet-team/media-hub/fix-1479036-trunk into lp://staging/media-hub

  1. fix-1479036-trunk
  2. Merge into trunk
Proposed by Jim Hodapp
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 162
Merged at revision: 160
Proposed branch: lp://staging/~phablet-team/media-hub/fix-1479036-trunk
Merge into: lp://staging/media-hub
Diff against target: 170 lines (+91/-11)
3 files modified
src/core/media/mpris/service.h (+12/-0)
src/core/media/service_implementation.cpp (+34/-5)
src/core/media/service_skeleton.cpp (+45/-6)
To merge this branch: bzr merge lp://staging/~phablet-team/media-hub/fix-1479036-trunk
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Alfonso Sanchez-Beato Approve
Review via email: mp+280888@code.staging.launchpad.net

Commit message

Fix bug #1479036 which prevents the out_of_range exception from causing media-hub-server from crashing when a player key is not found

Description of the change

Fix bug #1479036 which prevents the out_of_range exception from causing media-hub-server from crashing when a player key is not found

To post a comment you must log in.
lp://staging/~phablet-team/media-hub/fix-1479036-trunk updated
161. By Jim Hodapp

Make sure to pass on the failed Player key lookup to the client when possible.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/media-hub-ci/381/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/221/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/221/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/221/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/381/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/media-hub-ci/382/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/222/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/382/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~phablet-team/media-hub/fix-1479036-trunk updated
162. By Jim Hodapp

No need to catch out_of_range in set_current_player since it's handled in handle_set_current_player

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/media-hub-ci/383/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/223/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/223/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/223/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/383/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: