--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIid.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2002-2003 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime;
+
+import java.util.*;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class JNIid extends VMObject {
+  private static sun.jvm.hotspot.types.OopField holder;
+  private static AddressField next;
+  private static CIntegerField offset;
+  private static sun.jvm.hotspot.types.OopField resolvedMethod;
+  private static sun.jvm.hotspot.types.OopField resolvedReceiver;
+
+  private ObjectHeap heap;
+
+  static {
+    VM.registerVMInitializedObserver(new Observer() {
+        public void update(Observable o, Object data) {
+          initialize(VM.getVM().getTypeDataBase());
+        }
+      });
+  }
+
+  private static synchronized void initialize(TypeDataBase db) {
+
+    // FIXME: JNIid has been removed as part of redesign of JNI method,
+    // field ID generation. Please refer to src/share/vm/prims/jniId.hpp/.cpp
+    // For now, commenting out the below code.
+
+    /***********************************************************
+    Type type = db.lookupType("JNIid");
+
+    holder = type.getOopField("_holder");
+    next = type.getAddressField("_next");
+    offset = type.getCIntegerField("_offset");
+    resolvedMethod = type.getOopField("_resolved_method");
+    resolvedReceiver = type.getOopField("_resolved_receiver");
+    ***********************************************************/
+  }
+
+  public JNIid(Address addr, ObjectHeap heap) {
+    super(addr);
+    this.heap = heap;
+  }
+
+  public JNIid next() {
+    Address nextAddr = next.getValue(addr);
+    if (nextAddr == null) {
+      return null;
+    }
+    return new JNIid(nextAddr, heap);
+  }
+
+  public Klass     holder()           { return (Klass) heap.newOop(holder.getValue(addr)); }
+  public int       offset()           { return (int) offset.getValue(addr); }
+  public Method    method() {
+    return (Method) ((InstanceKlass) holder()).getMethods().getObjAt(offset());
+  }
+  public Method    resolvedMethod()   { return (Method) heap.newOop(resolvedMethod.getValue(addr)); }
+  public Klass     resolvedReceiver() { return (Klass) heap.newOop(resolvedReceiver.getValue(addr)); }
+}