From b566002c0ee65c30633abd9c72e8da58cd1b6aa9 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 22 Jan 2014 23:22:14 +0900 Subject: [PATCH] Fixed bug growing the size of the FastStatementList when the capacity is exceeded. --- .../zaxxer/hikari/util/FastStatementList.java | 8 +++++--- .../zaxxer/hikari/TestFastStatementList.java | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 src/test/java/com/zaxxer/hikari/TestFastStatementList.java diff --git a/src/main/java/com/zaxxer/hikari/util/FastStatementList.java b/src/main/java/com/zaxxer/hikari/util/FastStatementList.java index ad920daa..74d86177 100644 --- a/src/main/java/com/zaxxer/hikari/util/FastStatementList.java +++ b/src/main/java/com/zaxxer/hikari/util/FastStatementList.java @@ -16,7 +16,9 @@ package com.zaxxer.hikari.util; +import java.lang.reflect.Array; import java.sql.Statement; +import java.util.Arrays; /** @@ -63,11 +65,11 @@ public final class FastStatementList { // overflow-conscious code int oldCapacity = elementData.length; - int newCapacity = oldCapacity + (oldCapacity >> 1); + int newCapacity = oldCapacity << 2; Statement[] newElementData = new Statement[newCapacity]; - System.arraycopy(element, 0, newElementData, 0, oldCapacity); + System.arraycopy(elementData, 0, newElementData, 0, oldCapacity); newElementData[size++] = element; - elementData = newElementData; + elementData = (Statement[]) newElementData; } } diff --git a/src/test/java/com/zaxxer/hikari/TestFastStatementList.java b/src/test/java/com/zaxxer/hikari/TestFastStatementList.java new file mode 100644 index 00000000..11aade42 --- /dev/null +++ b/src/test/java/com/zaxxer/hikari/TestFastStatementList.java @@ -0,0 +1,19 @@ +package com.zaxxer.hikari; + +import org.junit.Test; + +import com.zaxxer.hikari.performance.StubStatement; +import com.zaxxer.hikari.util.FastStatementList; + +public class TestFastStatementList +{ + @Test + public void testOverflow() + { + FastStatementList list = new FastStatementList(); + for (int i = 0; i < 100; i++) + { + list.add(new StubStatement()); + } + } +}