diff options
| author | Bryce McKinlay <bryce@albatross.co.nz> | 1999-12-24 01:00:46 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 1999-12-24 01:00:46 +0000 |
| commit | 43cbc9430d557a3219ff833751c38132f831036e (patch) | |
| tree | 42d8776b8882e3c389088fa07c0348d511ab5edf /libjava/java/lang/natObject.cc | |
| parent | 07875628ee1bbcc753b44b4d962779d577cd605a (diff) | |
| download | gcc-43cbc9430d557a3219ff833751c38132f831036e.zip gcc-43cbc9430d557a3219ff833751c38132f831036e.tar.gz gcc-43cbc9430d557a3219ff833751c38132f831036e.tar.bz2 | |
natObject.cc (notify): Throw message with IllegalMonitorStateException.
1999-12-22 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/natObject.cc (notify): Throw message with
IllegalMonitorStateException.
(notifyAll): Ditto.
(wait): Ditto.
* java/lang/Thread.java (isInterrupted): Don't clear interrupt_flag.
(isInterrupted_): New function, which does clear interrupt_flag.
(interrupt): Use `isInterrupted_'.
* java/lang/natThread.cc (interrupt): Add comment.
(join): Set `Prev' in joiner loop.
Change various calls to `isInterrupted' to use `isInterrupted_'.
* posix-threads.cc (_Jv_CondWait): Allways use pthread_cond_timedwait
on linux. Set result to 0 on an interrupt. Test interrupted status
of java Thread object directly.
FLAG_INTERRUPTED: removed.
(_Jv_ThreadStart): Throw OutOfMemoryError if pthread_create fails.
(_Jv_ThreadInterrupt): Don't set FLAG_INTERRUPTED.
(_Jv_InitThreads): Don't block SIGINT.
(_Jv_ThreadWait): Don't configure SIGINT handler.
From-SVN: r31082
Diffstat (limited to 'libjava/java/lang/natObject.cc')
| -rw-r--r-- | libjava/java/lang/natObject.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc index 0ca5a58..3d9f9fb 100644 --- a/libjava/java/lang/natObject.cc +++ b/libjava/java/lang/natObject.cc @@ -175,7 +175,8 @@ java::lang::Object::notify (void) sync_init (); _Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info; if (_Jv_CondNotify (&si->condition, &si->mutex)) - JvThrow (new IllegalMonitorStateException); + JvThrow (new IllegalMonitorStateException(JvNewStringLatin1 + ("current thread not owner"))); } void @@ -185,7 +186,8 @@ java::lang::Object::notifyAll (void) sync_init (); _Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info; if (_Jv_CondNotifyAll (&si->condition, &si->mutex)) - JvThrow (new IllegalMonitorStateException); + JvThrow (new IllegalMonitorStateException(JvNewStringLatin1 + ("current thread not owner"))); } void @@ -197,7 +199,8 @@ java::lang::Object::wait (jlong timeout, jint nanos) JvThrow (new IllegalArgumentException); _Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info; if (_Jv_CondWait (&si->condition, &si->mutex, timeout, nanos)) - JvThrow (new IllegalMonitorStateException); + JvThrow (new IllegalMonitorStateException(JvNewStringLatin1 + ("current thread not owner"))); if (Thread::interrupted()) JvThrow (new InterruptedException); } |