Merge lp:~afrantzis/platform-api/fix-1233988-somewhat into lp:platform-api

[Alexandros Frantzis]

mirclient: Properly check for failed connections to the server

Failing to do so leads to invalid/error connections being used platform-api, leading to crashes.

mirclient: Properly check for failed connections to the server

Failing to do so leads to invalid/error connections being used by the platform-api, leading to crashes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/platform-api-ci/161/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/131

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/platform-api-ci/161/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

+1

[Robert Carr (robertcarr)]

review: Approve

=== modified file 'src/ubuntu/mirclient/application_instance_mirclient.cpp'
--- src/ubuntu/mirclient/application_instance_mirclient.cpp	2013-06-07 20:56:22 +0000
+++ src/ubuntu/mirclient/application_instance_mirclient.cpp	2013-10-10 14:13:21 +0000
@@ -57,12 +57,14 @@
 bool uamc::Instance::connect(std::string const& application_name)
 {
     auto mir_connection = mir_connect_sync(NULL, application_name.c_str());
-    if (mir_connection == nullptr)
-        return false;
+
+    // mir_connect_sync() always returns a connection object, even in case
+    // of a failed connection. We need to release this object in all cases.
     con = ConnectionPtr(mir_connection,
         [](MirConnection *c)
         {
             mir_connection_release(c);
         });
-    return true;
+
+    return mir_connection_is_valid(mir_connection);
 }