Merge lp:~michihenning/storage-framework/delete-later into lp:storage-framework/devel

[Michi Henning]

Use custom deleter for sockets given to client, so the socket is destroyed when the event loop is re-entered.

Use custom deleter for sockets given to client, so the socket is destroyed when the event loop is re-entered.

[James Henstridge (jamesh)]

Looks good.

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:65
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/103/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/534
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/540
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/442
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/442
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/442
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/372/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/372/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/372/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/372
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/372/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/103/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Thanks Michi!

=== modified file 'src/qt/client/internal/local_client/DownloaderImpl.cpp'
--- src/qt/client/internal/local_client/DownloaderImpl.cpp	2016-08-25 23:56:02 +0000
+++ src/qt/client/internal/local_client/DownloaderImpl.cpp	2016-09-01 03:12:17 +0000
@@ -258,7 +258,7 @@
 
 DownloaderImpl::DownloaderImpl(weak_ptr<File> file)
     : DownloaderBase(file)
-    , read_socket_(new QLocalSocket)
+    , read_socket_(new QLocalSocket, [](QLocalSocket* s){ s->deleteLater(); })
 {
     // Set up socket pair.
     int fds[2];

=== modified file 'src/qt/client/internal/local_client/UploaderImpl.cpp'
--- src/qt/client/internal/local_client/UploaderImpl.cpp	2016-08-25 23:56:02 +0000
+++ src/qt/client/internal/local_client/UploaderImpl.cpp	2016-09-01 03:12:17 +0000
@@ -356,7 +356,7 @@
                            ConflictPolicy policy,
                            weak_ptr<Root> root)
     : UploaderBase(policy, size)
-    , write_socket_(new QLocalSocket)
+    , write_socket_(new QLocalSocket, [](QLocalSocket* s){ s->deleteLater(); })
 {
     // Set up socket pair.
     int fds[2];

=== modified file 'src/qt/client/internal/remote_client/DownloaderImpl.cpp'
--- src/qt/client/internal/remote_client/DownloaderImpl.cpp	2016-08-26 02:51:11 +0000
+++ src/qt/client/internal/remote_client/DownloaderImpl.cpp	2016-09-01 03:12:17 +0000
@@ -52,7 +52,7 @@
     , fd_(fd)
     , file_(file)
     , provider_(provider)
-    , read_socket_(new QLocalSocket)
+    , read_socket_(new QLocalSocket, [](QLocalSocket* s){ s->deleteLater(); })
 {
     assert(!download_id.isEmpty());
     assert(fd.isValid());

=== modified file 'src/qt/client/internal/remote_client/UploaderImpl.cpp'
--- src/qt/client/internal/remote_client/UploaderImpl.cpp	2016-08-26 02:51:11 +0000
+++ src/qt/client/internal/remote_client/UploaderImpl.cpp	2016-09-01 03:12:17 +0000
@@ -53,7 +53,7 @@
     , old_etag_(old_etag)
     , root_(root.lock())
     , provider_(provider)
-    , write_socket_(new QLocalSocket)
+    , write_socket_(new QLocalSocket, [](QLocalSocket* s){ s->deleteLater(); })
     , state_(uploading)
 {
     assert(!upload_id.isEmpty());