Merge lp:~ken-vandine/content-hub/no_unknown into lp:content-hub

[Ken VanDine]

  protect against queries for Type::unknown

  protect against queries for Type::unknown

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:142
http://jenkins.qa.ubuntu.com/job/content-hub-ci/130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/33

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected?
 * No (besides the prerequisite branch included)
Is your branch in sync with latest trunk
 * Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
 * Yes
Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?
 * Yes
If you changed the UI, was the change specified/approved by design?
 * No UI changes
If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 * No packaging changes

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp	2014-03-21 17:55:30 +0000
+++ src/com/ubuntu/content/service/registry.cpp	2014-03-21 17:55:30 +0000
@@ -130,6 +130,10 @@
 void Registry::enumerate_known_destinations_for_type(cuc::Type type, const std::function<void(const cuc::Peer&)>&for_each)
 {
     TRACE() << Q_FUNC_INFO << type.id();
+
+    if (type == cuc::Type::unknown())
+        return;
+
     Q_FOREACH (QString k, m_dests->get(type.id()).toStringList())
     {
         TRACE() << Q_FUNC_INFO << k;
@@ -141,6 +145,9 @@
 {
     TRACE() << Q_FUNC_INFO << type.id();
 
+    if (type == cuc::Type::unknown())
+        return;
+
     Q_FOREACH (QString k, m_shares->get(type.id()).toStringList())
     {
         TRACE() << Q_FUNC_INFO << k;