# HG changeset patch
# User bobv
# Date 1486674183 18000
# Node ID 75ce8b72e3c96c90059955134d82156c13813013
# Parent  5de61384fba6bf846ba82f0557c833c885e6d066# Parent  73749cb53dc05f2037556672065a027952dc8358
Merge

diff -r 5de61384fba6 -r 75ce8b72e3c9 hotspot/src/share/vm/ci/ciReplay.cpp
--- a/hotspot/src/share/vm/ci/ciReplay.cpp	Thu Feb 09 15:43:54 2017 -0500
+++ b/hotspot/src/share/vm/ci/ciReplay.cpp	Thu Feb 09 16:03:03 2017 -0500
@@ -751,7 +751,7 @@
 
     assert(k->is_initialized(), "must be");
 
-    const char* field_name = parse_escaped_string();;
+    const char* field_name = parse_escaped_string();
     const char* field_signature = parse_string();
     fieldDescriptor fd;
     Symbol* name = SymbolTable::lookup(field_name, (int)strlen(field_name), CHECK);
@@ -840,9 +840,8 @@
         Handle value = java_lang_String::create_from_str(string_value, CHECK);
         java_mirror->obj_field_put(fd.offset(), value());
       } else if (field_signature[0] == 'L') {
-        Symbol* klass_name = SymbolTable::lookup(field_signature, (int)strlen(field_signature), CHECK);
-        KlassHandle kelem = resolve_klass(field_signature, CHECK);
-        oop value = InstanceKlass::cast(kelem())->allocate_instance(CHECK);
+        KlassHandle k = resolve_klass(string_value, CHECK);
+        oop value = InstanceKlass::cast(k())->allocate_instance(CHECK);
         java_mirror->obj_field_put(fd.offset(), value);
       } else {
         report_error("unhandled staticfield");