summaryrefslogtreecommitdiffstats
path: root/libjava/java/util
diff options
context:
space:
mode:
authorgreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2000-04-09 01:26:20 +0000
committergreen <green@138bc75d-0d04-0410-961f-82ee72b054a4>2000-04-09 01:26:20 +0000
commitb4e6c2ea572681ecba47a84b19d0f42b5012ff36 (patch)
tree61ee1a3348651b269368dca39f7c6b51b8237bf5 /libjava/java/util
parent2737c475d111ace3cc2352b73f6df29782c5f5c6 (diff)
downloadppe42-gcc-b4e6c2ea572681ecba47a84b19d0f42b5012ff36.tar.gz
ppe42-gcc-b4e6c2ea572681ecba47a84b19d0f42b5012ff36.zip
2000-04-08 Anthony Green <green@redhat.com>
* java/lang/natObject.cc (_Jv_MonitorEnter): Only perform null check when we have to. * gcj/array.h: Mark elements(JArray<T>& x) and elements(JArray<T>* x) as `inline'. * java/util/StringTokenizer.java: Minor optimization. Eliminates one method call. * java/util/Vector.java (VectorEnumeration.nextElement): Manually inline hasMoreElements. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33033 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util')
-rw-r--r--libjava/java/util/StringTokenizer.java2
-rw-r--r--libjava/java/util/Vector.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/libjava/java/util/StringTokenizer.java b/libjava/java/util/StringTokenizer.java
index b55c8f7714c..1686a0399e8 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 737c5b498f6..d98068082ad 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++];
OpenPOWER on IntegriCloud