From 8c9e2d18f0c7c69649beb41c328e5ae6c9f42882 Mon Sep 17 00:00:00 2001 From: bryce Date: Wed, 24 Sep 2003 06:19:24 +0000 Subject: [PATCH] * java/lang/StringBuffer.java (substring): Don't set `shared' on small Strings, even if buffer is already shared. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71726 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 5 +++++ libjava/java/lang/StringBuffer.java | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cadf1aad75a..3100d2fc262 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-09-24 Bryce McKinlay + + * java/lang/StringBuffer.java (substring): Don't set `shared' on small + Strings, even if buffer is already shared. + 2003-09-24 Michael Koch * acinclude.m4 (AM_LC_LOCALES): Added check for locale.h. diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java index a7c2590f39a..0903b40cc5f 100644 --- a/libjava/java/lang/StringBuffer.java +++ b/libjava/java/lang/StringBuffer.java @@ -564,11 +564,12 @@ public final class StringBuffer implements Serializable, CharSequence throw new StringIndexOutOfBoundsException(); if (len == 0) return ""; - // Share unless substring is smaller than 1/4 of the buffer. - if ((len << 2) >= value.length) - shared = true; + // Don't copy unless substring is smaller than 1/4 of the buffer. + boolean share_buffer = ((len << 2) >= value.length); + if (share_buffer) + this.shared = true; // Package constructor avoids an array copy. - return new String(value, beginIndex, len, shared); + return new String(value, beginIndex, len, share_buffer); } /** -- 2.11.0