agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java

*** 1114,1137 ****
              Oop obj = VM.getVM().getObjectHeap().newOop(klHandle);
              if (obj instanceof InstanceKlass) {
                  InstanceKlass kls = (InstanceKlass) obj;
                  buf.append(" " + kls.getName().asString() + "={");
                  int flen = ov.fieldsSize();
! 
!                 TypeArray klfields = kls.getFields();
!                 int klen = (int) klfields.getLength();
! 
!                 ConstantPool cp = kls.getConstants();
                  int findex = 0;
!                 for (int index = 0; index < klen; index += kls.NEXT_OFFSET) {
!                     int accsFlags = klfields.getShortAt(index + kls.ACCESS_FLAGS_OFFSET);
!                     int nameIndex = klfields.getShortAt(index + kls.NAME_INDEX_OFFSET);
                      AccessFlags access = new AccessFlags(accsFlags);
                      if (!access.isStatic()) {
                          ScopeValue svf = ov.getFieldAt(findex++);
                          String    fstr = scopeValueAsString(sd, svf);
-                         Symbol f_name  = cp.getSymbolAt(nameIndex);
                          buf.append(" [" + f_name.asString() + " :"+ index + "]=(#" + fstr + ")");
                      }
                  }
                  buf.append(" }");
              } else {
--- 1114,1132 ----
              Oop obj = VM.getVM().getObjectHeap().newOop(klHandle);
              if (obj instanceof InstanceKlass) {
                  InstanceKlass kls = (InstanceKlass) obj;
                  buf.append(" " + kls.getName().asString() + "={");
                  int flen = ov.fieldsSize();
!                 int klen = kls.getJavaFieldsCount();
                  int findex = 0;
!                 for (int index = 0; index < klen; index++) {
!                     int accsFlags = kls.getFieldAccessFlags(index);
!                     Symbol f_name = kls.getFieldName(index);
                      AccessFlags access = new AccessFlags(accsFlags);
                      if (!access.isStatic()) {
                          ScopeValue svf = ov.getFieldAt(findex++);
                          String    fstr = scopeValueAsString(sd, svf);
                          buf.append(" [" + f_name.asString() + " :"+ index + "]=(#" + fstr + ")");
                      }
                  }
                  buf.append(" }");
              } else {
*** 1817,1833 ****
        }
     }
  
     protected String genHTMLListForFields(InstanceKlass klass) {
        Formatter buf = new Formatter(genHTML);
!       TypeArray fields = klass.getFields();
!       int numFields = (int) fields.getLength();
!       ConstantPool cp = klass.getConstants();
        if (numFields != 0) {
           buf.h3("Fields");
           buf.beginList();
!          for (int f = 0; f < numFields; f += InstanceKlass.NEXT_OFFSET) {
             sun.jvm.hotspot.oops.Field field = klass.getFieldByIndex(f);
             String f_name = ((NamedFieldIdentifier)field.getID()).getName();
             Symbol f_sig  = field.getSignature();
             Symbol f_genSig = field.getGenericSignature();
             AccessFlags acc = field.getAccessFlagsObj();
--- 1812,1826 ----
        }
     }
  
     protected String genHTMLListForFields(InstanceKlass klass) {
        Formatter buf = new Formatter(genHTML);
!       int numFields = klass.getJavaFieldsCount();
        if (numFields != 0) {
           buf.h3("Fields");
           buf.beginList();
!          for (int f = 0; f < numFields; f++) {
             sun.jvm.hotspot.oops.Field field = klass.getFieldByIndex(f);
             String f_name = ((NamedFieldIdentifier)field.getID()).getName();
             Symbol f_sig  = field.getSignature();
             Symbol f_genSig = field.getGenericSignature();
             AccessFlags acc = field.getAccessFlagsObj();