* gnu/classpath/jdwp/natVMVirtualMachine.cc

        (jdwpClassPrepareCB): Move class status stuff to ...
        (getClassStatus): ... here.

From-SVN: r122164

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8e52bc41cfb8238213df4231f0bdeeeac7d63ce0..088f5eb7908d8e259b504dd489d383b8d47b4c7b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-20  Keith Seitz  <keiths@redhat.com>
+
+       * gnu/classpath/jdwp/natVMVirtualMachine.cc
+       (jdwpClassPrepareCB): Move class status stuff to ...
+       (getClassStatus): ... here.
+
 2007-02-20  Gary Benson  <gbenson@redhat.com>
 
        * gnu/awt/xlib/XEventLoop.h: Regenerated.

diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
index c47d440ea2f362e145a184c99742eb01c5cd3815..3ea5f9a76d6c995539f1af74046adc70f4ac2a09 100644 (file)
--- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
+++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
@@ -453,9 +453,25 @@ gnu::classpath::jdwp::VMVirtualMachine::getAllLoadedClasses (void)
 
 jint
 gnu::classpath::jdwp::VMVirtualMachine::
-getClassStatus (MAYBE_UNUSED jclass klass)
+getClassStatus (jclass klass)
 {
-  return 0;
+  jint flags = 0;
+  jvmtiError err = _jdwp_jvmtiEnv->GetClassStatus (klass, &flags);
+  if (err != JVMTI_ERROR_NONE)
+    throw_jvmti_error (err);
+
+  using namespace gnu::classpath::jdwp::event;
+  jint status = 0;
+  if (flags & JVMTI_CLASS_STATUS_VERIFIED)
+    status |= ClassPrepareEvent::STATUS_VERIFIED;
+  if (flags & JVMTI_CLASS_STATUS_PREPARED)
+    status |= ClassPrepareEvent::STATUS_PREPARED;
+  if (flags & JVMTI_CLASS_STATUS_ERROR)
+    status |= ClassPrepareEvent::STATUS_ERROR;
+  if (flags & JVMTI_CLASS_STATUS_INITIALIZED)
+    status |= ClassPrepareEvent::STATUS_INITIALIZED;
+
+  return status;
 }
 
 JArray<gnu::classpath::jdwp::VMMethod *> *
@@ -812,27 +828,12 @@ jdwpBreakpointCB (jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
 }
 
 static void JNICALL
-jdwpClassPrepareCB (jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
+jdwpClassPrepareCB (MAYBE_UNUSED jvmtiEnv *env, MAYBE_UNUSED JNIEnv *jni_env,
                    jthread thread, jclass klass)
 {
   using namespace gnu::classpath::jdwp;
 
-  jint flags = 0;
-  jvmtiError err = env->GetClassStatus (klass, &flags);
-  if (err != JVMTI_ERROR_NONE)
-    throw_jvmti_error (err);
-
-  using namespace gnu::classpath::jdwp::event;
-  jint status = 0;
-  if (flags & JVMTI_CLASS_STATUS_VERIFIED)
-    status |= ClassPrepareEvent::STATUS_VERIFIED;
-  if (flags & JVMTI_CLASS_STATUS_PREPARED)
-    status |= ClassPrepareEvent::STATUS_PREPARED;
-  if (flags & JVMTI_CLASS_STATUS_ERROR)
-    status |= ClassPrepareEvent::STATUS_ERROR;
-  if (flags & JVMTI_CLASS_STATUS_INITIALIZED)
-    status |= ClassPrepareEvent::STATUS_INITIALIZED;
-
+  jint status = VMVirtualMachine::getClassStatus (klass);
   event::ClassPrepareEvent *event
     = new event::ClassPrepareEvent (thread, klass, status);
   Jdwp::notify (event);