Merge

Fri, 30 Aug 2013 13:38:45 -0400

author
zgu
date
Fri, 30 Aug 2013 13:38:45 -0400
changeset 5618
ac2764460da7
parent 5615
c636758ea616
parent 5617
491de79915eb
child 5621
abff50660360
child 5623
735f94656acc

Merge

     1.1 --- a/src/share/vm/runtime/fprofiler.cpp	Fri Aug 30 07:04:42 2013 -0700
     1.2 +++ b/src/share/vm/runtime/fprofiler.cpp	Fri Aug 30 13:38:45 2013 -0400
     1.3 @@ -925,6 +925,8 @@
     1.4        FlatProfiler::interval_print();
     1.5        FlatProfiler::interval_reset();
     1.6      }
     1.7 +
     1.8 +    FREE_C_HEAP_ARRAY(JavaThread *, threadsList, mtInternal);
     1.9    } else {
    1.10      // Couldn't get the threads lock, just record that rather than blocking
    1.11      FlatProfiler::threads_lock_ticks += 1;

mercurial