fixed #929

Observer::unregisterWith(...) and QL_ENABLE_THREAD_SAFE_OBSERVER_PATTERN
lballabio · Nov 28, 2020 · 831faf3 · 831faf3
1 parent 60afa35
commit 831faf3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/ql/patterns/observable.hpp b/ql/patterns/observable.hpp
@@ -541,8 +541,7 @@ namespace QuantLib {
     Size Observer::unregisterWith(const ext::shared_ptr<Observable>& h) {
         boost::lock_guard<boost::recursive_mutex> lock(mutex_);
 
-        if (h)  {
-            QL_REQUIRE(proxy_, "unregister called without a proxy");
+        if (h && proxy_)  {
             h->unregisterObserver(proxy_);
         }
 

diff --git a/test-suite/observable.cpp b/test-suite/observable.cpp
@@ -307,6 +307,23 @@ void ObservableTest::testDeepUpdate() {
     BOOST_CHECK_CLOSE(v4, 0.21, 1E-10);
 }
 
+namespace {
+	class DummyObserver : public Observer {
+	  public:
+		DummyObserver() {}
+		void update() {}
+	};
+}
+
+void ObservableTest::testEmptyObserverList() {
+	BOOST_TEST_MESSAGE("Testing unregisterWith call on empty observer...");
+
+    SavedSettings backup;
+
+    const ext::shared_ptr<DummyObserver> dummyObserver=ext::make_shared<DummyObserver>();
+    dummyObserver->unregisterWith(ext::make_shared<SimpleQuote>(10.0));
+}
+
 test_suite* ObservableTest::suite() {
     test_suite* suite = BOOST_TEST_SUITE("Observer tests");
 
@@ -319,7 +336,7 @@ test_suite* ObservableTest::suite() {
 #endif
 
     suite->add(QUANTLIB_TEST_CASE(&ObservableTest::testDeepUpdate));
-
+    suite->add(QUANTLIB_TEST_CASE(&ObservableTest::testEmptyObserverList));
     return suite;
 }
 
diff --git a/test-suite/observable.hpp b/test-suite/observable.hpp
@@ -31,6 +31,7 @@ class ObservableTest {
     static void testAsyncGarbagCollector();
     static void testMultiThreadingGlobalSettings();
     static void testDeepUpdate();
+    static void testEmptyObserverList();
 
     static boost::unit_test_framework::test_suite* suite();
 };