address-book-service

Merge lp:~renatofilho/address-book-service/fix-1518486 into lp:address-book-service

  1. fix-1518486
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Arthur Mello
Approved revision: 220
Merged at revision: 223
Proposed branch: lp:~renatofilho/address-book-service/fix-1518486
Merge into: lp:address-book-service
Diff against target: 51 lines (+5/-4)
2 files modified
lib/dirtycontact-notify.cpp (+3/-3)
lib/dirtycontact-notify.h (+2/-1)
To merge this branch: bzr merge lp:~renatofilho/address-book-service/fix-1518486
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+306327@code.launchpad.net

Commit message

Check if adaptor was destroyed before use it.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:220
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/14/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1589
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/377
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1589
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1437/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1437/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1437/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1437/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1437/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1437/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1437/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1437/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1437
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1437/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-service-ci/14/rebuild

review: Approve (continuous-integration)
Revision history for this message
Arthur Mello (artmello) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/dirtycontact-notify.cpp'
--- lib/dirtycontact-notify.cpp 2015-12-08 15:46:17 +0000
+++ lib/dirtycontact-notify.cpp 2016-09-21 12:19:17 +0000
@@ -36,7 +36,7 @@
3636
37void DirtyContactsNotify::insertAddedContacts(QSet<QString> ids)37void DirtyContactsNotify::insertAddedContacts(QSet<QString> ids)
38{38{
39 if (!m_adaptor->isReady()) {39 if (!m_adaptor || !m_adaptor->isReady()) {
40 return;40 return;
41 }41 }
4242
@@ -71,7 +71,7 @@
7171
72void DirtyContactsNotify::insertRemovedContacts(QSet<QString> ids)72void DirtyContactsNotify::insertRemovedContacts(QSet<QString> ids)
73{73{
74 if (!m_adaptor->isReady()) {74 if (!m_adaptor || !m_adaptor->isReady()) {
75 return;75 return;
76 }76 }
7777
@@ -90,7 +90,7 @@
9090
91void DirtyContactsNotify::insertChangedContacts(QSet<QString> ids)91void DirtyContactsNotify::insertChangedContacts(QSet<QString> ids)
92{92{
93 if (!m_adaptor->isReady()) {93 if (!m_adaptor || !m_adaptor->isReady()) {
94 return;94 return;
95 }95 }
9696
9797
=== modified file 'lib/dirtycontact-notify.h'
--- lib/dirtycontact-notify.h 2015-09-17 13:39:44 +0000
+++ lib/dirtycontact-notify.h 2016-09-21 12:19:17 +0000
@@ -23,6 +23,7 @@
23#include <QtCore/QTimer>23#include <QtCore/QTimer>
24#include <QtCore/QSet>24#include <QtCore/QSet>
25#include <QtCore/QString>25#include <QtCore/QString>
26#include <QtCore/QPointer>
2627
27namespace galera {28namespace galera {
2829
@@ -48,7 +49,7 @@
48 void emitSignals();49 void emitSignals();
4950
50private:51private:
51 AddressBookAdaptor *m_adaptor;52 QPointer<AddressBookAdaptor> m_adaptor;
52 QTimer m_timer;53 QTimer m_timer;
53 QSet<QString> m_contactsChanged;54 QSet<QString> m_contactsChanged;
54 QSet<QString> m_contactsAdded;55 QSet<QString> m_contactsAdded;

Subscribers

People subscribed via source and target branches