Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Mon May 03 17:23:58 2010 -0400
     1.2 +++ b/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	Mon May 03 20:19:05 2010 -0700
     1.3 @@ -1424,10 +1424,9 @@
     1.4  
     1.5  bool CMSCollector::shouldConcurrentCollect() {
     1.6    if (_full_gc_requested) {
     1.7 -    assert(ExplicitGCInvokesConcurrent, "Unexpected state");
     1.8      if (Verbose && PrintGCDetails) {
     1.9        gclog_or_tty->print_cr("CMSCollector: collect because of explicit "
    1.10 -                             " gc request");
    1.11 +                             " gc request (or gc_locker)");
    1.12      }
    1.13      return true;
    1.14    }