* gnu/gcj/runtime/StringBuffer.java

	(ensureCapacity_unsynchronized): Ensure we always get at least
	`minimumCapacity' characters in new buffer.

From-SVN: r47940

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 29b5db7fec9f0741e4fb1c42df1be3cc49eb4762..e8ec6e8c3e32ce478ef48cb553560b088c8c2424 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-12  Tom Tromey  <tromey@redhat.com>
+
+       * gnu/gcj/runtime/StringBuffer.java
+       (ensureCapacity_unsynchronized): Ensure we always get at least
+       `minimumCapacity' characters in new buffer.
+
 2001-12-11  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/String.java (String): New constructor.

diff --git a/libjava/gnu/gcj/runtime/StringBuffer.java b/libjava/gnu/gcj/runtime/StringBuffer.java
index 403f952c951df955a680efc36e34c97310015a7e..3cbcef6fe67eb1fb3b6da9afd5a57a66bd0ba80d 100644 (file)
--- a/libjava/gnu/gcj/runtime/StringBuffer.java
+++ b/libjava/gnu/gcj/runtime/StringBuffer.java
@@ -130,7 +130,7 @@ public final class StringBuffer
   {
     if (minimumCapacity > value.length)
       {
-       minimumCapacity = value.length * 2 + 2;
+       minimumCapacity = Math.max (minimumCapacity, value.length * 2 + 2);
        char[] nb = new char[minimumCapacity];
        System.arraycopy(value, 0, nb, 0, count);
        value = nb;