# HG changeset patch
# User zgu
# Date 1377884325 14400
# Node ID 1739ea7c82899b891fec724565c9c7c0d72abb71
# Parent  d55ba95422d7461831c3c8ba242404ebbe3d56e6# Parent  1f0f30ed36e6d7257d48ab35a82649d2d17f1332
Merge

diff -r d55ba95422d7 -r 1739ea7c8289 hotspot/src/share/vm/runtime/fprofiler.cpp
--- a/hotspot/src/share/vm/runtime/fprofiler.cpp	Fri Aug 30 07:04:42 2013 -0700
+++ b/hotspot/src/share/vm/runtime/fprofiler.cpp	Fri Aug 30 13:38:45 2013 -0400
@@ -925,6 +925,8 @@
       FlatProfiler::interval_print();
       FlatProfiler::interval_reset();
     }
+
+    FREE_C_HEAP_ARRAY(JavaThread *, threadsList, mtInternal);
   } else {
     // Couldn't get the threads lock, just record that rather than blocking
     FlatProfiler::threads_lock_ticks += 1;