src/hotspot/share/gc/g1/g1CollectedHeap.cpp

*** 1166,1176 ****
      // Full GC was not completed.
      return false;
    }
  
    const bool do_clear_all_soft_refs = clear_all_soft_refs ||
!       collector_policy()->should_clear_all_soft_refs();
  
    G1FullCollector collector(this, &_full_gc_memory_manager, explicit_gc, do_clear_all_soft_refs);
    GCTraceTime(Info, gc) tm("Pause Full", NULL, gc_cause(), true);
  
    collector.prepare_collection();
--- 1166,1176 ----
      // Full GC was not completed.
      return false;
    }
  
    const bool do_clear_all_soft_refs = clear_all_soft_refs ||
!       soft_ref_policy()->should_clear_all_soft_refs();
  
    G1FullCollector collector(this, &_full_gc_memory_manager, explicit_gc, do_clear_all_soft_refs);
    GCTraceTime(Info, gc) tm("Pause Full", NULL, gc_cause(), true);
  
    collector.prepare_collection();
*** 1341,1351 ****
  
    if (result != NULL) {
      return result;
    }
  
!   assert(!collector_policy()->should_clear_all_soft_refs(),
           "Flag should have been handled and cleared prior to this point");
  
    // What else?  We might try synchronous finalization later.  If the total
    // space available is large enough for the allocation, then a more
    // complete compaction phase than we've tried so far might be
--- 1341,1351 ----
  
    if (result != NULL) {
      return result;
    }
  
!   assert(!soft_ref_policy()->should_clear_all_soft_refs(),
           "Flag should have been handled and cleared prior to this point");
  
    // What else?  We might try synchronous finalization later.  If the total
    // space available is large enough for the allocation, then a more
    // complete compaction phase than we've tried so far might be
*** 1461,1470 ****
--- 1461,1471 ----
  
  G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* collector_policy) :
    CollectedHeap(),
    _young_gen_sampling_thread(NULL),
    _collector_policy(collector_policy),
+   _soft_ref_policy(),
    _memory_manager("G1 Young Generation", "end of minor GC"),
    _full_gc_memory_manager("G1 Old Generation", "end of major GC"),
    _eden_pool(NULL),
    _survivor_pool(NULL),
    _old_pool(NULL),
*** 1891,1900 ****
--- 1892,1905 ----
  
  CollectorPolicy* G1CollectedHeap::collector_policy() const {
    return _collector_policy;
  }
  
+ SoftRefPolicy* G1CollectedHeap::soft_ref_policy() {
+   return &_soft_ref_policy;
+ }
+ 
  size_t G1CollectedHeap::capacity() const {
    return _hrm.length() * HeapRegion::GrainBytes;
  }
  
  size_t G1CollectedHeap::unused_committed_regions_in_bytes() const {