* src/native/jni.cpp (GetObjectClass): Remove null pointer check.

* tests/regression/native/checkjni.java: Adapt test.
* tests/regression/native/checkjni.output: Adapt test output.

Hotspot doesn't accept a null pointer here, so neither should we.

diff --git a/src/native/jni.cpp b/src/native/jni.cpp
index 9a06ab245edff229ea2488bc75953414b521401d..bf1401a65938524be30623e3d156548fbdf9a221 100644 (file)
--- a/src/native/jni.cpp
+++ b/src/native/jni.cpp
@@ -1,6 +1,6 @@
 /* src/native/jni.cpp - implementation of the Java Native Interface functions
 
-   Copyright (C) 1996-2011
+   Copyright (C) 1996-2012
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
@@ -1425,9 +1425,6 @@ jclass jni_GetObjectClass(JNIEnv *env, jobject obj)
 
        o = (java_handle_t *) obj;
 
-       if ((o == NULL) || (LLNI_vftbl_direct(o) == NULL))
-               return NULL;
-
        LLNI_class_get(o, c);
 
        java_handle_t* h = LLNI_classinfo_wrap(c);

diff --git a/tests/regression/native/checkjni.java b/tests/regression/native/checkjni.java
index e7de8773390f1f0ea39e5c5127f7a2f0d74aaf27..5cfd2f409a5c01881143ab1f393222294ae885e8 100644 (file)
--- a/tests/regression/native/checkjni.java
+++ b/tests/regression/native/checkjni.java
@@ -1,9 +1,7 @@
 /* src/tests/native/checkjni.java - for testing JNI related stuff
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   TU Wien
+   Copyright (C) 1996-2012
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,12 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
 */
 
 
@@ -140,7 +132,6 @@ public class checkjni {
 
         equal(GetObjectClass(obj1), clazz1);
         equal(GetObjectClass(obj2), clazz2);
-        equal(GetObjectClass(null), null);
     }
 
        void checkNewString() {

diff --git a/tests/regression/native/checkjni.output b/tests/regression/native/checkjni.output
index 41895324628b8db33670e84becd32f107c22067f..0b05c7479607ef6af4b4d1118655fc7c021138d4 100644 (file)
--- a/tests/regression/native/checkjni.output
+++ b/tests/regression/native/checkjni.output
@@ -20,7 +20,6 @@ PASS, java.lang.Exception: Exception from JNI
 GetObjectClass:
 PASS
 PASS
-PASS
 Field Access:
 PASS
 PASS