diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/natObject.cc | 3 | ||||
| -rw-r--r-- | libjava/java/util/StringTokenizer.java | 2 | ||||
| -rw-r--r-- | libjava/java/util/Vector.java | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc index 25b2966..99e7ac5 100644 --- a/libjava/java/lang/natObject.cc +++ b/libjava/java/lang/natObject.cc @@ -18,6 +18,7 @@ details. */ #include <jvm.h> #include <java/lang/Object.h> #include <java-threads.h> +#include <java-signal.h> #include <java/lang/CloneNotSupportedException.h> #include <java/lang/IllegalArgumentException.h> #include <java/lang/IllegalMonitorStateException.h> @@ -224,8 +225,10 @@ _Jv_InitializeSyncMutex (void) jint _Jv_MonitorEnter (jobject obj) { +#ifndef HANDLE_SEGV if (! obj) JvThrow (new java::lang::NullPointerException); +#endif if (INIT_NEEDED (obj)) obj->sync_init (); _Jv_SyncInfo *si = (_Jv_SyncInfo *) obj->sync_info; 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++]; |