diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6c9cf85bf9f..173cef9892f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-17  Anthony Green  <green@redhat.com>
+
+	* jni.cc (unwrap): Fix test for wrapped objects.
+
 2001-11-16  Tom Tromey  <tromey@redhat.com>
 
 	* verify.cc (_Jv_BytecodeVerifier::check_field_constant): Handle
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 1aa77bc2c04..dbe1d1f4f29 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -212,7 +212,7 @@ unwrap (T *obj)
   using namespace gnu::gcj::runtime;
   // We can compare the class directly because JNIWeakRef is `final'.
   // Doing it this way is much faster.
-  if (obj == NULL || obj->getClass () == &JNIWeakRef::class$)
+  if (obj == NULL || obj->getClass () != &JNIWeakRef::class$)
     return obj;
   JNIWeakRef *wr = reinterpret_cast<JNIWeakRef *> (obj);
   return reinterpret_cast<T *> (wr->get ());