--- old/src/hotspot/share/services/heapDumper.cpp	Wed Nov  8 08:13:31 2017
+++ new/src/hotspot/share/services/heapDumper.cpp	Wed Nov  8 08:13:30 2017
@@ -1897,9 +1897,7 @@
 
   _stack_traces = NEW_C_HEAP_ARRAY(ThreadStackTrace*, Threads::number_of_threads(), mtInternal);
   int frame_serial_num = 0;
-  ThreadsListHandle tlh;
-  JavaThreadIterator jti(tlh.list());
-  for (JavaThread* thread = jti.first(); thread != NULL; thread = jti.next()) {
+  for (JavaThreadIteratorWithHandle jtiwh; JavaThread *thread = jtiwh.next(); ) {
     oop threadObj = thread->threadObj();
     if (threadObj != NULL && !thread->is_exiting() && !thread->is_hidden_from_external_view()) {
       // dump thread stack trace