Continuation: delete self after calling _done()

make sure Continuation delete itself even when virtual function
_done() is overwrited.

Signed-off-by: Yan, Zheng <zyan@redhat.com>

diff --git a/src/common/Continuation.h b/src/common/Continuation.h
index c7e3057467e70df1a239bbbbb13c7c0b5e96a1f7..856c6b8b47f693338d324770e8b9642041375448 100644 (file)
--- a/src/common/Continuation.h
+++ b/src/common/Continuation.h
@@ -116,7 +116,6 @@ protected:
    virtual void _done() {
      on_finish->complete(rval);
      on_finish = NULL;
-     delete this;
      return;
    }
 
@@ -149,6 +148,7 @@ private:
     if (done ||
         (reported_done && stages_processing.empty())) {
       _done();
+      delete this;
     }
   }
 

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index ea11314ce1ca4897a113ec54b974e5e62a961e3b..cf7b0031ee3f2a85329fe0efc0dcd03dc6183165 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3961,7 +3961,6 @@ next:
       if (fin) {
         fin->complete(get_rval());
       }
-      delete this;
     }
   };