Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[bug-69351] fix issues with removing items from IntList 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1921017 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2024-09-29 07:12:48 +00:00
parent a3d9bb7e35
commit 52039e220d
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
poi/src/main/java/org/apache/poi/util/IntList.java
View File

@ -18,9 +18,9 @@
package org.apache.poi.util; package org.apache.poi.util;
/** /**
* A List of int's; as full an implementation of the java.util.List * A List of `int`s; as full an implementation of the java.util.List
* interface as possible, with an eye toward minimal creation of * interface as possible, with an eye toward minimal creation of
* objects * objects.
* *
* the mimicry of List is as follows: * the mimicry of List is as follows:
* <ul> * <ul>
@ -40,6 +40,8 @@ package org.apache.poi.util;
* remove(int index) * remove(int index)
* <li> subList is not supported * <li> subList is not supported
* </ul> * </ul>
*
* This class is only meant for internal use in Apache POI.
*/ */
public class IntList public class IntList
{ {
@ -434,6 +436,9 @@ public class IntList
} }
int rval = _array[ index ]; int rval = _array[ index ];
if(_limit == _array.length) {
growArray(_limit + 1);
}
System.arraycopy(_array, index + 1, _array, index, _limit - index); System.arraycopy(_array, index + 1, _array, index, _limit - index);
_limit--; _limit--;
return rval; return rval;
@ -458,6 +463,9 @@ public class IntList
if (o == _array[ j ]) if (o == _array[ j ])
{ {
if (j+1 < _limit) { if (j+1 < _limit) {
if(_limit == _array.length) {
growArray(_limit + 1);
}
System.arraycopy(_array, j + 1, _array, j, _limit - j); System.arraycopy(_array, j + 1, _array, j, _limit - j);
} }
_limit--; _limit--;

26
poi/src/test/java/org/apache/poi/util/TestIntList.java
View File

@ -510,4 +510,30 @@ final class TestIntList {
assertEquals(a5[j], list.get(j)); assertEquals(a5[j], list.get(j));
} }
} }
@Test
void bug69351() {
final int size = 10;
final IntList list = new IntList(size);
assertEquals(0, list.size());
for (int i = 0; i < size; i++) {
list.add(i);
}
assertEquals(size, list.size());
assertTrue(list.removeValue(size - 2));
assertEquals(size - 1, list.size());
}
@Test
void testRemove69351() {
final int size = 10;
final IntList list = new IntList(size);
assertEquals(0, list.size());
for (int i = 0; i < size; i++) {
list.add(i);
}
assertEquals(size, list.size());
assertEquals(size - 2, list.remove(size - 2));
assertEquals(size - 1, list.size());
}
} }