Initialize ClassDef index to -1 instead of 0 in DexPool

This commit is contained in:
Ben Gruver 2013-06-01 13:41:53 -07:00
parent 2973f7a4af
commit f1f00f9f6e
2 changed files with 7 additions and 7 deletions

View File

@ -229,11 +229,11 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
}
@Override public Integer getValue() {
return classDef.classDefOffset;
return classDef.classDefIndex;
}
@Override public Integer setValue(Integer value) {
return classDef.classDefOffset = value;
return classDef.classDefIndex = value;
}
};
}
@ -519,7 +519,7 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
}
@Override public int getItemIndex(@Nonnull PoolClassDef classDef) {
return classDef.classDefOffset;
return classDef.classDefIndex;
}
@Nonnull @Override public Collection<? extends Map.Entry<PoolClassDef, Integer>> getItems() {
@ -531,12 +531,12 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
}
@Override public Integer getValue() {
return classDef.classDefOffset;
return classDef.classDefIndex;
}
@Override public Integer setValue(Integer value) {
int prev = classDef.classDefOffset;
classDef.classDefOffset = value;
int prev = classDef.classDefIndex;
classDef.classDefIndex = value;
return prev;
}
}

View File

@ -49,7 +49,7 @@ class PoolClassDef extends BaseTypeReference implements ClassDef {
@Nonnull final ImmutableSortedSet<PoolMethod> directMethods;
@Nonnull final ImmutableSortedSet<PoolMethod> virtualMethods;
int classDefOffset = DexPool.NO_OFFSET;
int classDefIndex = DexPool.NO_INDEX;
int encodedArrayOffset = DexPool.NO_OFFSET;
int annotationDirectoryOffset = DexPool.NO_OFFSET;