--- old/src/hotspot/share/gc/cms/cmsHeap.cpp	2017-11-28 11:57:03.134782968 +0100
+++ new/src/hotspot/share/gc/cms/cmsHeap.cpp	2017-11-28 11:57:02.878785938 +0100
@@ -51,11 +51,11 @@
   }
 
   MemoryUsage get_memory_usage() {
-    size_t maxSize   = (available_for_allocation() ? max_size() : 0);
+    size_t max_heap_size   = (available_for_allocation() ? max_size() : 0);
     size_t used      = used_in_bytes();
     size_t committed = _space->capacity();
 
-    return MemoryUsage(initial_size(), used, committed, maxSize);
+    return MemoryUsage(initial_size(), used, committed, max_heap_size);
   }
 
   size_t used_in_bytes() {
@@ -65,8 +65,8 @@
 
 CMSHeap::CMSHeap(GenCollectorPolicy *policy) :
   GenCollectedHeap(policy), _eden_pool(NULL), _survivor_pool(NULL), _old_pool(NULL) {
-  _young_mgr = new GCMemoryManager("ParNew", "end of minor GC");
-  _old_mgr = new GCMemoryManager("ConcurrentMarkSweep", "end of major GC");
+  _young_manager = new GCMemoryManager("ParNew", "end of minor GC");
+  _old_manager = new GCMemoryManager("ConcurrentMarkSweep", "end of major GC");
 
   _workers = new WorkGang("GC Thread", ParallelGCThreads,
                           /* are_GC_task_threads */true,
@@ -102,12 +102,14 @@
                                                old->reserved().byte_size(),
                                                true);
 
-  _young_mgr->add_pool(_eden_pool);
-  _young_mgr->add_pool(_survivor_pool);
-
-  _old_mgr->add_pool(_eden_pool);
-  _old_mgr->add_pool(_survivor_pool);
-  _old_mgr->add_pool(_old_pool);
+  _young_manager->add_pool(_eden_pool);
+  _young_manager->add_pool(_survivor_pool);
+  young->set_gc_manager(_young_manager);
+
+  _old_manager->add_pool(_eden_pool);
+  _old_manager->add_pool(_survivor_pool);
+  _old_manager->add_pool(_old_pool);
+  old ->set_gc_manager(_old_manager);
 
   return JNI_OK;
 }
@@ -244,8 +246,8 @@
 
 GrowableArray<GCMemoryManager*> CMSHeap::memory_managers() {
   GrowableArray<GCMemoryManager*> memory_managers(2);
-  memory_managers.append(_young_mgr);
-  memory_managers.append(_old_mgr);
+  memory_managers.append(_young_manager);
+  memory_managers.append(_old_manager);
   return memory_managers;
 }