1.1 --- a/src/share/vm/classfile/classFileParser.cpp Tue Jan 05 13:05:58 2010 +0100
1.2 +++ b/src/share/vm/classfile/classFileParser.cpp Tue Jan 05 15:21:25 2010 +0100
1.3 @@ -643,7 +643,7 @@
1.4 guarantee_property(value_type.is_int(), "Inconsistent constant value type in class file %s", CHECK);
1.5 break;
1.6 case T_OBJECT:
1.7 - guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;", 18)
1.8 + guarantee_property((cp->symbol_at(signature_index)->equals("Ljava/lang/String;")
1.9 && (value_type.is_string() || value_type.is_unresolved_string())),
1.10 "Bad string initial value in class file %s", CHECK);
1.11 break;
1.12 @@ -1718,9 +1718,7 @@
1.13 m->set_exception_table(exception_handlers());
1.14
1.15 // Copy byte codes
1.16 - if (code_length > 0) {
1.17 - memcpy(m->code_base(), code_start, code_length);
1.18 - }
1.19 + m->set_code(code_start);
1.20
1.21 // Copy line number table
1.22 if (linenumber_table != NULL) {
