# HG changeset patch
# User tonyp
# Date 1282931046 25200
# Node ID a774c26f5fc3a4ca79b4cb524c4eb9aa703ac9a6
# Parent  cf377b51c52b813df806085cb83aa3b4ef3bb025# Parent  97a16ae704a593e90f09ac85ac12c46cad68e195
Merge

diff -r cf377b51c52b -r a774c26f5fc3 hotspot/src/share/vm/services/management.cpp
--- a/hotspot/src/share/vm/services/management.cpp	Fri Aug 27 16:57:04 2010 +0100
+++ b/hotspot/src/share/vm/services/management.cpp	Fri Aug 27 10:44:06 2010 -0700
@@ -785,10 +785,11 @@
     }
   }
 
-  // In our current implementation, all pools should have
-  // defined init and max size
-  assert(!has_undefined_init_size, "Undefined init size");
-  assert(!has_undefined_max_size, "Undefined max size");
+  // In our current implementation, we make sure that all non-heap
+  // pools have defined init and max sizes. Heap pools do not matter,
+  // as we never use total_init and total_max for them.
+  assert(heap || !has_undefined_init_size, "Undefined init size");
+  assert(heap || !has_undefined_max_size,  "Undefined max size");
 
   MemoryUsage usage((heap ? InitialHeapSize : total_init),
                     total_used,