Mercurial > hg > orthanc-stone

diff Framework/Loaders/LoaderStateMachine.cpp @ 1059:e713f1a99861 broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing MessageBroker by weak_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 11 Oct 2019 17:08:34 +0200
parents 262a0244e9b2
children 3e8f59cefec6
line wrap: on
line diff
--- a/Framework/Loaders/LoaderStateMachine.cpp	Fri Oct 11 13:38:35 2019 +0200
+++ b/Framework/Loaders/LoaderStateMachine.cpp	Fri Oct 11 17:08:34 2019 +0200
@@ -136,7 +136,6 @@
   template <typename T>
   void LoaderStateMachine::HandleSuccessMessage(const T& message)
   {
-    LOG(TRACE) << "LoaderStateMachine(" << std::hex << this << std::dec << ")::HandleSuccessMessage(). Receiver fingerprint = " << GetFingerprint();
     if (activeCommands_ <= 0) {
       LOG(ERROR) << "LoaderStateMachine(" << std::hex << this << std::dec << ")::HandleSuccessMessage : activeCommands_ should be > 0 but is: " << activeCommands_;
     }
@@ -159,7 +158,6 @@
 
   LoaderStateMachine::LoaderStateMachine(IOracle& oracle,
                                          IObservable& oracleObservable) :
-    IObserver(oracleObservable.GetBroker()),
     oracle_(oracle),
     oracleObservable_(oracleObservable),
     active_(false),
@@ -170,19 +168,19 @@
 
     oracleObservable.RegisterObserverCallback(
       new Callable<LoaderStateMachine, OrthancRestApiCommand::SuccessMessage>
-      (*this, &LoaderStateMachine::HandleSuccessMessage));
+      (shared_from_this(), &LoaderStateMachine::HandleSuccessMessage));
 
     oracleObservable.RegisterObserverCallback(
       new Callable<LoaderStateMachine, GetOrthancImageCommand::SuccessMessage>
-      (*this, &LoaderStateMachine::HandleSuccessMessage));
+      (shared_from_this(), &LoaderStateMachine::HandleSuccessMessage));
 
     oracleObservable.RegisterObserverCallback(
       new Callable<LoaderStateMachine, GetOrthancWebViewerJpegCommand::SuccessMessage>
-      (*this, &LoaderStateMachine::HandleSuccessMessage));
+      (shared_from_this(), &LoaderStateMachine::HandleSuccessMessage));
 
     oracleObservable.RegisterObserverCallback(
       new Callable<LoaderStateMachine, OracleCommandExceptionMessage>
-      (*this, &LoaderStateMachine::HandleExceptionMessage));
+      (shared_from_this(), &LoaderStateMachine::HandleExceptionMessage));
   }
 
   LoaderStateMachine::~LoaderStateMachine()