* src/vm/hook.hpp: Added new file for hook points.

[cacao.git] / src / native / vm / cldc1.1 / java_lang_Object.cpp

diff --git a/src/native/vm/cldc1.1/java_lang_Object.cpp b/src/native/vm/cldc1.1/java_lang_Object.cpp
index 839dca7444977e009529bdf1cd8e4a8a97553487..8d4fa016b57107a5a144bc658b0f2d0a965d9dbf 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Object.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Object.cpp
@@ -109,20 +109,9 @@ JNIEXPORT void JNICALL Java_java_lang_Object_notifyAll(JNIEnv *env, jobject _thi
  */
 JNIEXPORT void JNICALL Java_java_lang_Object_wait(JNIEnv *env, jobject _this, jlong timeout)
 {
-#if defined(ENABLE_JVMTI)
-       /* Monitor Wait */
-       if (jvmti) jvmti_MonitorWaiting(true, _this, timeout);
-#endif
-
 #if defined(ENABLE_THREADS)
        lock_wait_for_object((java_handle_t *) _this, timeout, 0);
 #endif
-
-#if defined(ENABLE_JVMTI)
-       /* Monitor Waited */
-       /* XXX: How do you know if wait timed out ?*/
-       if (jvmti) jvmti_MonitorWaiting(false, _this, 0);
-#endif
 }
 
 } // extern "C"
@@ -147,11 +136,10 @@ static JNINativeMethod methods[] = {
  
 void _Jv_java_lang_Object_init(void)
 {
-       utf *u;
- 
-       u = utf_new_char("java/lang/Object");
+       utf* u = utf_new_char("java/lang/Object");
  
-       native_method_register(u, methods, NATIVE_METHODS_COUNT);
+       NativeMethods& nm = VM::get_current()->get_nativemethods();
+       nm.register_methods(u, methods, NATIVE_METHODS_COUNT);
 }