From 3bd835f73ff668e5214eb8be402781d594ea93dc Mon Sep 17 00:00:00 2001 From: Anthony Green Date: Sun, 9 Apr 2000 01:26:20 +0000 Subject: natObject.cc (_Jv_MonitorEnter): Only perform null check when we have to. 2000-04-08 Anthony Green * java/lang/natObject.cc (_Jv_MonitorEnter): Only perform null check when we have to. * gcj/array.h: Mark elements(JArray& x) and elements(JArray* x) as `inline'. * java/util/StringTokenizer.java: Minor optimization. Eliminates one method call. * java/util/Vector.java (VectorEnumeration.nextElement): Manually inline hasMoreElements. From-SVN: r33033 --- libjava/java/util/StringTokenizer.java | 2 +- libjava/java/util/Vector.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libjava/java/util') diff --git a/libjava/java/util/StringTokenizer.java b/libjava/java/util/StringTokenizer.java index b55c8f7..1686a03 100644 --- a/libjava/java/util/StringTokenizer.java +++ b/libjava/java/util/StringTokenizer.java @@ -180,6 +180,6 @@ public class StringTokenizer implements Enumeration // more readable this way, so we'll take the hit on efficiency. private boolean isDelimiter(char ch) { - return delimiters.indexOf(ch) >= 0; + return delimiters.indexOf(ch, 0) >= 0; } } diff --git a/libjava/java/util/Vector.java b/libjava/java/util/Vector.java index 737c5b4..d980680 100644 --- a/libjava/java/util/Vector.java +++ b/libjava/java/util/Vector.java @@ -38,7 +38,7 @@ class VectorEnumeration implements Enumeration public Object nextElement() { - if (!hasMoreElements()) + if (! (enumIndex < enumVec.size())) throw new NoSuchElementException(); return enumVec.elementData[enumIndex++]; -- cgit v1.1