--- a/hotspot/src/share/vm/services/memoryService.cpp	Thu Apr 02 16:08:41 2015 +0200
+++ b/hotspot/src/share/vm/services/memoryService.cpp	Thu Apr 02 16:37:29 2015 +0200
@@ -126,9 +126,8 @@
   CollectorPolicy* policy = heap->collector_policy();
 
   assert(policy->is_generation_policy(), "Only support two generations");
-  guarantee(heap->n_gens() == 2, "Only support two-generation heap");
-
   GenCollectorPolicy* gen_policy = policy->as_generation_policy();
+  guarantee(gen_policy->number_of_generations() == 2, "Only support two-generation heap");
   if (gen_policy != NULL) {
     Generation::Name kind = gen_policy->young_gen_spec()->name();
     switch (kind) {