Merge lp:~thomas-voss/dbus-cpp/ensure-Signal-for-void-dtor-is-exception-safe into lp:dbus-cpp

[Thomas Voß]

Ensure Signal<void>::~Signal is exception safe.

Ensure Signal<void>::~Signal is exception safe.

[lp:~thomas-voss/dbus-cpp/ensure-Signal-for-void-dtor-is-exception-safe]

91. By Thomas Voß on 2014-11-10

Update source code comment.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/213/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/213/rebuild

review: Approve (continuous-integration)

[lp:~thomas-voss/dbus-cpp/ensure-Signal-for-void-dtor-is-exception-safe]

92. By Thomas Voß on 2014-11-10

Ensure Signal<void>::~Signal is exception safe.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:92
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/214/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/214/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

LGTM

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-05 07:40:35 +0000
+++ CMakeLists.txt	2014-11-10 12:30:01 +0000
@@ -62,7 +62,7 @@
 ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
 
 set(DBUS_CPP_VERSION_MAJOR 4)
-set(DBUS_CPP_VERSION_MINOR 2)
+set(DBUS_CPP_VERSION_MINOR 3) 
 set(DBUS_CPP_VERSION_PATCH 0)
 
 include(CTest)

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-05 07:51:07 +0000
+++ debian/changelog	2014-11-10 12:30:01 +0000
@@ -1,3 +1,9 @@
+dbus-cpp (4.3.0) UNRELEASED; urgency=medium
+
+  * Ensure Signal<void>::~Signal is exception safe.
+
+ -- Thomas Voss <[e-mail]>  Mon, 10 Nov 2014 09:34:52 +0100
+
 dbus-cpp (4.2.0+15.04.20141105-0ubuntu1) vivid; urgency=medium
 
   [ Thomas Voss ]

=== modified file 'include/core/dbus/impl/signal.h'
--- include/core/dbus/impl/signal.h	2014-11-04 21:48:24 +0000
+++ include/core/dbus/impl/signal.h	2014-11-10 12:30:01 +0000
@@ -32,7 +32,16 @@
     signal_about_to_be_destroyed();
 
     parent->signal_router.uninstall_route(Object::SignalKey{interface, name});
-    parent->remove_match(rule);
+    try
+    {
+        parent->remove_match(rule);
+    }
+    catch (...)
+    {
+        // Intentionally left empty as we do not care about the match rule
+        // not being removed at this point. There is hardly anything we can
+        // do and just assume correct state.
+    }
 }
 
 template<typename SignalDescription, typename Argument>