*** old/src/share/vm/classfile/javaClasses.cpp	Fri Apr 25 14:05:09 2014
--- new/src/share/vm/classfile/javaClasses.cpp	Fri Apr 25 14:05:09 2014

*** 373,392 ****
--- 373,392 ----
    oop          obj    = java_string();
    typeArrayOop value  = java_lang_String::value(obj);
    int          offset = java_lang_String::offset(obj);
    int          length = java_lang_String::length(obj);
    jchar* base = (length == 0) ? NULL : value->char_at_addr(offset);
!   Symbol* sym = SymbolTable::lookup_unicode(base, length, THREAD);
!   Symbol* sym = SymbolTable::lookup_and_add_unicode(base, length, THREAD);
    return sym;
  }
  
  Symbol* java_lang_String::as_symbol_or_null(oop java_string) {
    typeArrayOop value  = java_lang_String::value(java_string);
    int          offset = java_lang_String::offset(java_string);
    int          length = java_lang_String::length(java_string);
    jchar* base = (length == 0) ? NULL : value->char_at_addr(offset);
!   return SymbolTable::probe_unicode(base, length);
!   return SymbolTable::lookup_and_ignore_hash_unicode(base, length);
  }
  
  
  int java_lang_String::utf8_length(oop java_string) {
    typeArrayOop value  = java_lang_String::value(java_string);

*** 752,762 ****
--- 752,762 ----
      } else {
        ResourceMark rm;
        const char* sigstr = k->signature_name();
        int         siglen = (int) strlen(sigstr);
        if (!intern_if_not_found) {
!         name = SymbolTable::probe(sigstr, siglen);
!         name = SymbolTable::lookup_and_ignore_hash(sigstr, siglen);
        } else {
          name = SymbolTable::new_symbol(sigstr, siglen, THREAD);
        }
      }
    }

*** 2833,2843 ****
--- 2833,2843 ----
    print_signature(mt, &buffer);
    const char* sigstr =       buffer.base();
    int         siglen = (int) buffer.size();
    Symbol *name;
    if (!intern_if_not_found) {
!     name = SymbolTable::probe(sigstr, siglen);
!     name = SymbolTable::lookup_and_ignore_hash(sigstr, siglen);
    } else {
      name = SymbolTable::new_symbol(sigstr, siglen, THREAD);
    }
    return name;
  }