commit 2be848de6b7041da7f335a1053cbfbf841a5d1e3
author Mathias Agopian <mathias@google.com> Thu May 19 20:41:27 2011 -0700
committer Alex Ray <aray@google.com> Tue Jul 30 13:56:56 2013 -0700
tree 8d66cb55e2fcf7a2c7bbd47f144416d01fbf80a0
parent d781137601c05b623305592fbbe7b2d7d69087dd

Call RefBase::destroy() when OBJECT_LIFETIME_* is not the default

Change-Id: Ifb2069e095dba57b7d97e9f2d942fd85fa975f58

libs/utils/RefBase.cpp

diff --git a/libs/utils/RefBase.cpp b/libs/utils/RefBase.cpp
index 9f55a71..dd0052a 100644
--- a/libs/utils/RefBase.cpp
+++ b/libs/utils/RefBase.cpp
@@ -419,7 +419,8 @@
     
     if ((impl->mFlags&OBJECT_LIFETIME_WEAK) != OBJECT_LIFETIME_WEAK) {
         if (impl->mStrong == INITIAL_STRONG_VALUE)
-            delete impl->mBase;
+            if (impl->mBase)
+                impl->mBase->destroy();
         else {
             // LOGV("Freeing refs %p of old RefBase %p\n", this, impl->mBase);
             delete impl;
@@ -427,7 +428,8 @@
     } else {
         impl->mBase->onLastWeakRef(id);
         if ((impl->mFlags&OBJECT_LIFETIME_FOREVER) != OBJECT_LIFETIME_FOREVER) {
-            delete impl->mBase;
+            if (impl->mBase)
+                impl->mBase->destroy();
         }
     }
 }