ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Mathias Agopian 2011-05-20 13:15:20 -07:00 committed by Android (Google) Code Review
parent 3933bcd76f 8561698c9b
commit d31099f021
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/utils/RefBase.cpp
View File

@ -419,7 +419,8 @@ void RefBase::weakref_type::decWeak(const void* id)
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 @@ void RefBase::weakref_type::decWeak(const void* id)
} else {
impl->mBase->onLastWeakRef(id);
if ((impl->mFlags&OBJECT_LIFETIME_FOREVER) != OBJECT_LIFETIME_FOREVER) {
delete impl->mBase;
if (impl->mBase)
impl->mBase->destroy();
}
}
}