src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactoryImpl.java

*** 125,159 ****
     public JSJavaVM newJSJavaVM() {
        return new JSJavaVM(this);
     }
  
     // -- Internals only below this point
!    private Symbol javaLangString() {
        if (javaLangString == null) {
!          javaLangString = getSymbol("java/lang/String");
        }
        return javaLangString;
     }
  
!    private Symbol javaLangThread() {
        if (javaLangThread == null) {
!          javaLangThread = getSymbol("java/lang/Thread");
        }
        return javaLangThread;
     }
  
!    private Symbol javaLangClass() {
        if (javaLangClass == null) {
!          javaLangClass = getSymbol("java/lang/Class");
        }
        return javaLangClass;
     }
  
-    private Symbol getSymbol(String str) {
-       return VM.getVM().getSymbolTable().probe(str);
-    }
- 
     private JSJavaObject newJavaInstance(Instance instance) {
        // look for well-known classes
        Symbol className = instance.getKlass().getName();
        if (Assert.ASSERTS_ENABLED) {
           Assert.that(className != null, "Null class name");
--- 125,155 ----
     public JSJavaVM newJSJavaVM() {
        return new JSJavaVM(this);
     }
  
     // -- Internals only below this point
!    private String javaLangString() {
        if (javaLangString == null) {
!          javaLangString = "java/lang/String";
        }
        return javaLangString;
     }
  
!    private String javaLangThread() {
        if (javaLangThread == null) {
!          javaLangThread = "java/lang/Thread";
        }
        return javaLangThread;
     }
  
!    private String javaLangClass() {
        if (javaLangClass == null) {
!          javaLangClass = "java/lang/Class";
        }
        return javaLangClass;
     }
  
     private JSJavaObject newJavaInstance(Instance instance) {
        // look for well-known classes
        Symbol className = instance.getKlass().getName();
        if (Assert.ASSERTS_ENABLED) {
           Assert.that(className != null, "Null class name");
*** 194,202 ****
        return res;
     }
  
     // Map<Oop, SoftReference<JSJavaObject>>
     private Map om = new HashMap();
!    private Symbol javaLangString;
!    private Symbol javaLangThread;
!    private Symbol javaLangClass;
  }
--- 190,198 ----
        return res;
     }
  
     // Map<Oop, SoftReference<JSJavaObject>>
     private Map om = new HashMap();
!    private String javaLangString;
!    private String javaLangThread;
!    private String javaLangClass;
  }