am 584e0fd6: am a798a16a: am 6d3d5395: Merge "Fix a bug: wrong parent position is written when moving."

* commit '584e0fd668d201f2fab66404a8fc11cd1949c90e':
  Fix a bug: wrong parent position is written when moving.
main
Keisuke Kuroyanagi 2013-10-09 21:26:23 -07:00 committed by Android Git Automerger
commit 5b61f1d249
1 changed files with 2 additions and 1 deletions

View File

@ -240,7 +240,8 @@ bool DynamicPatriciaTrieWritingHelper::markNodeAsMovedAndSetPosition(
int parentOffsetFieldPos = nodeReader->getHeadPos()
+ DynamicPatriciaTrieWritingUtils::NODE_FLAG_FIELD_SIZE;
if (!DynamicPatriciaTrieWritingUtils::writeParentPosOffsetAndAdvancePosition(
mBuffer, movedPos, nodeReader->getHeadPos(), &parentOffsetFieldPos)) {
mBuffer, bigramLinkedNodePos, nodeReader->getHeadPos(),
&parentOffsetFieldPos)) {
// Parent offset cannot be written because of a bug or a broken dictionary; thus,
// we give up to update dictionary.
return false;