Mercurial > hg > truffle
comparison src/share/vm/classfile/classFileParser.cpp @ 12873:4e7f99b70d9d
Merge
author | adlertz |
---|---|
date | Wed, 09 Oct 2013 05:03:34 -0700 |
parents | 268e7a2178d7 |
children | cefad50507d8 ac9cb1d5a202 8321dcc18438 |
comparison
equal
deleted
inserted
replaced
12872:98692a2d36d7 | 12873:4e7f99b70d9d |
---|---|
2543 CHECK_NULL); | 2543 CHECK_NULL); |
2544 | 2544 |
2545 if (method->is_final()) { | 2545 if (method->is_final()) { |
2546 *has_final_method = true; | 2546 *has_final_method = true; |
2547 } | 2547 } |
2548 if (is_interface && !method->is_abstract() && !method->is_static()) { | 2548 if (is_interface && !(*has_default_methods) |
2549 && !method->is_abstract() && !method->is_static() | |
2550 && !method->is_private()) { | |
2549 // default method | 2551 // default method |
2550 *has_default_methods = true; | 2552 *has_default_methods = true; |
2551 } | 2553 } |
2552 _methods->at_put(index, method()); | 2554 _methods->at_put(index, method()); |
2553 } | 2555 } |