From 867ba35e6f0e87faaf4005366aeaa62da0e501f4 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 24 May 2005 08:24:31 +0000 Subject: * java/util/regex/Pattern.java (split): Assign value of variable matched outside while statement. * gnu/regexp/RE.java (getCharUnit): Assign value of unit.bk variable outside if statement. * gnu/CORBA/bufferedResponseHandler.java (createReply): Assign values from static class type constants. * gnu/CORBA/IOR.java (_write_no_endian): Likewise. * gnu/CORBA/Functional_ORB.java (respond_to_client): Likewise. (serve): Likewise. --- java/util/regex/Pattern.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'java/util/regex/Pattern.java') diff --git a/java/util/regex/Pattern.java b/java/util/regex/Pattern.java index 06418a22a..7fde5c8db 100644 --- a/java/util/regex/Pattern.java +++ b/java/util/regex/Pattern.java @@ -1,5 +1,5 @@ /* Pattern.java -- Compiled regular expression ready to be applied. - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -188,9 +188,9 @@ public final class Pattern implements Serializable int count = 0; int start = 0; int end; - boolean matched; + boolean matched = matcher.find(); - while (matched = matcher.find() && (limit <= 0 || count < limit - 1)) + while (matched && (limit <= 0 || count < limit - 1)) { ++count; end = matcher.start(); @@ -208,6 +208,7 @@ public final class Pattern implements Serializable list.add(text); } start = matcher.end(); + matched = matcher.find(); } // We matched nothing. -- cgit v1.2.1