diff -r 7109807f56e9 -r 31062cb3cc8e jdk/src/share/classes/java/lang/management/MemoryPoolMXBean.java --- a/jdk/src/share/classes/java/lang/management/MemoryPoolMXBean.java Tue Jul 09 12:47:37 2013 -0700 +++ b/jdk/src/share/classes/java/lang/management/MemoryPoolMXBean.java Wed Jul 10 14:20:19 2013 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,7 +49,7 @@ * It can be obtained by calling the * {@link PlatformManagedObject#getObjectName} method. * - *

Memory Type

+ *

Memory Type

*

The Java virtual machine has a heap for object allocation and also * maintains non-heap memory for the method area and the Java virtual * machine execution. The Java virtual machine can have one or more @@ -60,7 +60,7 @@ *

  • {@link MemoryType#NON_HEAP non-heap}
  • * * - *

    Memory Usage Monitoring

    + *

    Memory Usage Monitoring

    * * A memory pool has the following attributes: * * - *

    1. Memory Usage

    + *

    1. Memory Usage

    * * The {@link #getUsage} method provides an estimate * of the current usage of a memory pool. @@ -86,14 +86,14 @@ * the current memory usage. An implementation should document when * this is the case. * - *

    2. Peak Memory Usage

    + *

    2. Peak Memory Usage

    * * The Java virtual machine maintains the peak memory usage of a memory * pool since the virtual machine was started or the peak was reset. * The peak memory usage is returned by the {@link #getPeakUsage} method * and reset by calling the {@link #resetPeakUsage} method. * - *

    3. Usage Threshold

    + *

    3. Usage Threshold

    * * Each memory pool has a manageable attribute * called the usage threshold which has a default value supplied @@ -304,7 +304,7 @@ * * * - *

    4. Collection Usage Threshold

    + *

    4. Collection Usage Threshold

    * * Collection usage threshold is a manageable attribute only applicable * to some garbage-collected memory pools.