diff options
| author | Mark Wielaard <mark@klomp.org> | 2004-07-09 10:37:20 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2004-07-09 10:37:20 +0000 |
| commit | 012816983e42e8efe74df9876009a60ae0ffabf6 (patch) | |
| tree | a47e2fb408fc4eff98e4464257f58888e33fb984 | |
| parent | b5a43ab76719abc71ff8ac0ba202feb28770eabb (diff) | |
| download | classpath-012816983e42e8efe74df9876009a60ae0ffabf6.tar.gz | |
* native/jni/gtk-peer/gthread-jni.c (setup_cache): Call
ExceptionOccurred, not ExceptionCheck, when we don't have JNI 1.2.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gthread-jni.c | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2004-08-08 Mark Wielaard <mark@klomp.org> + + * native/jni/gtk-peer/gthread-jni.c (setup_cache): Call + ExceptionOccurred, not ExceptionCheck, when we don't have JNI 1.2. + 2004-07-08 Mark Wielaard <mark@klomp.org> * javax/swing/Box.java: Put FIXME comment above class declaration. diff --git a/native/jni/gtk-peer/gthread-jni.c b/native/jni/gtk-peer/gthread-jni.c index dfb7f5ee6..d66ef0376 100644 --- a/native/jni/gtk-peer/gthread-jni.c +++ b/native/jni/gtk-peer/gthread-jni.c @@ -756,7 +756,12 @@ setup_cache (JNIEnv * env) if (setup_exception_cache (env) < 0) return initialized = -1; - assert ( ! (*env)->ExceptionCheck (env)); +#ifdef JNI_VERSION_1_2 + if (HAVE_JNI_VERSION_1_2) + assert ( ! (*env)->ExceptionCheck (env)); + else +#endif + assert ( ! (*env)->ExceptionOccurred (env)); /* java.lang.Object and its methods */ lcl_class = (*env)->FindClass (env, "java/lang/Object"); |