From 29890538394d9a6c63346a404dd90c4f5f0256ed Mon Sep 17 00:00:00 2001 From: ziga Date: Wed, 8 Jun 2005 15:46:08 +0000 Subject: 2005-06-08 Ziga Mahkovec * java/text/MessageFormat.java (parse): When parsing strings, check for an empty pattern trailer. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100761 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/text/MessageFormat.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libjava/java/text') diff --git a/libjava/java/text/MessageFormat.java b/libjava/java/text/MessageFormat.java index 4a24afd1f44..8d53ec21ec1 100644 --- a/libjava/java/text/MessageFormat.java +++ b/libjava/java/text/MessageFormat.java @@ -658,7 +658,11 @@ public class MessageFormat extends Format { // We have a String format. This can lose in a number // of ways, but we give it a shot. - int next_index = sourceStr.indexOf(elements[i].trailer, index); + int next_index; + if (elements[i].trailer.length() > 0) + next_index = sourceStr.indexOf(elements[i].trailer, index); + else + next_index = sourceStr.length(); if (next_index == -1) { pos.setErrorIndex(index); -- cgit v1.2.3