# HG changeset patch # User kvn # Date 1268778933 25200 # Node ID 428a9c451986891a4dbd36c5b2e6a6ab2fc6ee59 # Parent 9eba43136cb5f79681b2c673ea430140aec5a8f7 6935466: new CodeCache flushing code is not guarded by the flag Summary: Add missing guard. Reviewed-by: never diff -r 9eba43136cb5 -r 428a9c451986 src/share/vm/compiler/compileBroker.cpp --- a/src/share/vm/compiler/compileBroker.cpp Tue Mar 16 11:52:17 2010 +0100 +++ b/src/share/vm/compiler/compileBroker.cpp Tue Mar 16 15:35:33 2010 -0700 @@ -988,10 +988,12 @@ } if (method->is_not_compilable(comp_level)) return NULL; - nmethod* saved = CodeCache::find_and_remove_saved_code(method()); - if (saved != NULL) { - method->set_code(method, saved); - return saved; + if (UseCodeCacheFlushing) { + nmethod* saved = CodeCache::find_and_remove_saved_code(method()); + if (saved != NULL) { + method->set_code(method, saved); + return saved; + } } } else {