Automerged (cherrypicked) cset from 5.6:
zhenxing.he@sun.com-20101117085902-n9gfvlkmm44t38y0 This takes care of valgrind warnings in 5.5 that exhibit the same trace as in BUG#11763879 (BUG#56649).
This commit is contained in:
parent
47ef8f3452
commit
96a41c47d4
@ -73,7 +73,10 @@ public:
|
|||||||
while (info && info->observer != observer)
|
while (info && info->observer != observer)
|
||||||
info= iter++;
|
info= iter++;
|
||||||
if (info)
|
if (info)
|
||||||
|
{
|
||||||
iter.remove();
|
iter.remove();
|
||||||
|
delete info;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
ret= TRUE;
|
ret= TRUE;
|
||||||
unlock();
|
unlock();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user