* src/vm/jit/arm/emit.c (emit_verbosecall_enter): Remove broken support for

[cacao.git] / src / vm / javaobjects.cpp

diff --git a/src/vm/javaobjects.cpp b/src/vm/javaobjects.cpp
index 0aa5af11f81de68d0da713a3ad6dc7b2e0dde43c..2d24815118656449d462168210007b023fe7f98b 100644 (file)
--- a/src/vm/javaobjects.cpp
+++ b/src/vm/javaobjects.cpp
@@ -1,6 +1,6 @@
 /* src/vm/javaobjects.cpp - functions to create and access Java objects
 
-   Copyright (C) 2010, 2011
+   Copyright (C) 1996-2011
    CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
    Copyright (C) 2008, 2009 Theobroma Systems Ltd.
 
@@ -169,11 +169,11 @@ java_handle_t* java_lang_reflect_Method::invoke(java_handle_t* o, java_handle_ob
                if (!access_check_method(m, 2))
                        return NULL;
 #elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
-               /* We only pass 1 here as stacktrace_get_caller_class, which
+               /* We only pass 0 here as stacktrace_get_caller_class, which
                   is called from access_check_method, skips
                   java.lang.reflect.Method.invoke(). */
 
-               if (!access_check_method(m, 1))
+               if (!access_check_method(m, 0))
                        return NULL;
 #else
 # error unknown classpath configuration
@@ -253,6 +253,7 @@ off_t java_lang_Thread::offset_daemon;
 off_t java_lang_Thread::offset_group;
 off_t java_lang_Thread::offset_uncaughtExceptionHandler;
 off_t java_lang_Thread::offset_threadStatus;
+off_t java_lang_Thread::offset_me;
 
 static DynOffsetEntry dyn_entries_java_lang_Thread[] = {
        { &java_lang_Thread::set_priority_offset,                 "priority" },
@@ -260,6 +261,7 @@ static DynOffsetEntry dyn_entries_java_lang_Thread[] = {
        { &java_lang_Thread::set_group_offset,                    "group" },
        { &java_lang_Thread::set_uncaughtExceptionHandler_offset, "uncaughtExceptionHandler" },
        { &java_lang_Thread::set_threadStatus_offset,             "threadStatus" },
+       { &java_lang_Thread::set_me_offset,                       "me" },
        { 0, 0 }
 };