eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix capacity calculation in ArrayList and StringBuilder.

Browse Source 
See #289 and #290
This commit is contained in:
Alexey Andreev 2017-06-25 13:37:15 +03:00
parent d982f89ab6
commit b477a7dcad
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classlib/src/main/java/org/teavm/classlib/java/lang/TAbstractStringBuilder.java
View File

@ -581,7 +581,10 @@ class TAbstractStringBuilder extends TObject implements TSerializable, TCharSequ
if (buffer.length >= capacity) { if (buffer.length >= capacity) {
return; return;
} }
buffer = TArrays.copyOf(buffer, capacity * 2 + 1); int newLength = buffer.length < Integer.MAX_VALUE / 2
? Math.max(capacity, Math.max(buffer.length * 2, 5))
: Integer.MAX_VALUE;
buffer = TArrays.copyOf(buffer, newLength);
} }
public void trimToSize() { public void trimToSize() {

5
classlib/src/main/java/org/teavm/classlib/java/util/TArrayList.java
View File

@ -53,7 +53,10 @@ public class TArrayList<E> extends TAbstractList<E> implements TCloneable, TSeri
public void ensureCapacity(int minCapacity) { public void ensureCapacity(int minCapacity) {
if (array.length < minCapacity) { if (array.length < minCapacity) {
array = TArrays.copyOf(array, array.length + TMath.max(5, array.length / 2)); int newLength = array.length < Integer.MAX_VALUE / 2
? Math.max(minCapacity, Math.max(array.length * 2, 5))
: Integer.MAX_VALUE;
array = TArrays.copyOf(array, newLength);
} }
} }