*** old/src/share/vm/prims/jvm.cpp	Fri Mar 18 14:59:21 2011
--- new/src/share/vm/prims/jvm.cpp	Fri Mar 18 14:59:21 2011

*** 1806,1816 ****
--- 1806,1816 ----
    constantTag tag = cp->tag_at(index);
    if (!tag.is_klass() && !tag.is_unresolved_klass()) {
      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
    }
    klassOop k = cp->klass_at(index, CHECK_NULL);
-   return (jclass) JNIHandles::make_local(k->klass_part()->java_mirror());
  }
  JVM_END
  
  
  JVM_ENTRY(jclass, JVM_ConstantPoolGetClassAtIfLoaded(JNIEnv *env, jobject unused, jobject jcpool, jint index))

*** 1822,1832 ****
--- 1822,1832 ----
    if (!tag.is_klass() && !tag.is_unresolved_klass()) {
      THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Wrong type at constant pool index");
    }
    klassOop k = constantPoolOopDesc::klass_at_if_loaded(cp, index);
    if (k == NULL) return NULL;
-   return (jclass) JNIHandles::make_local(k->klass_part()->java_mirror());
  }
  JVM_END
  
  static jobject get_method_at_helper(constantPoolHandle cp, jint index, bool force_resolution, TRAPS) {
    constantTag tag = cp->tag_at(index);