archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Coleen Phillimore 2015-10-22 17:24:17 +00:00
commit a4efe9440b
21 changed files with 166 additions and 359 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -2469,16 +2469,6 @@ bool Arguments::check_vm_args_consistency() {
}
}
// Note: only executed in non-PRODUCT mode
if (!UseAsyncConcMarkSweepGC &&
(ExplicitGCInvokesConcurrent ||
ExplicitGCInvokesConcurrentAndUnloadsClasses)) {
jio_fprintf(defaultStream::error_stream(),
"error: +ExplicitGCInvokesConcurrent[AndUnloadsClasses] conflicts"
" with -UseAsyncConcMarkSweepGC");
status = false;
}
if (PrintNMTStatistics) {
#if INCLUDE_NMT
if (MemTracker::tracking_level() == NMT_off) {