2 files changed, 14 insertions, 0 deletions
diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
index d4985bf2f2e..6da1d1d631e 100644
--- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
+++ b/libjava/gnu/classpath/jdwp/VMVirtualMachine.java
@@ -57,6 +57,8 @@ import java.util.Iterator;
  */
 public class VMVirtualMachine
 {
+  public static native void initialize ();
+
   /**
    * Suspend a thread
    *
diff --git a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
index ef4605bedbf..b475c49931d 100644
--- a/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
+++ b/libjava/gnu/classpath/jdwp/natVMVirtualMachine.cc
@@ -10,6 +10,8 @@ details. */
 
 #include <config.h>
 #include <gcj/cni.h>
+#include <jvm.h>
+#include <jvmti.h>
 
 #include <java/lang/Class.h>
 #include <java/lang/ClassLoader.h>
@@ -28,6 +30,16 @@ using namespace java::lang;
 using namespace gnu::classpath::jdwp::event;
 using namespace gnu::classpath::jdwp::util;
 
+// JVMTI environment
+static jvmtiEnv *_jdwp_jvmtiEnv;
+
+void
+gnu::classpath::jdwp::VMVirtualMachine::initialize ()
+{
+  JavaVM *vm = _Jv_GetJavaVM ();
+  vm->GetEnv (reinterpret_cast<void **> (&_jdwp_jvmtiEnv), JVMTI_VERSION_1_0);
+}
+
 void
 gnu::classpath::jdwp::VMVirtualMachine ::suspendThread (Thread *thread)
 {