--- old/src/hotspot/share/prims/jvmtiEnvBase.cpp	2018-01-29 16:53:43.460373617 -0500
+++ new/src/hotspot/share/prims/jvmtiEnvBase.cpp	2018-01-29 16:53:42.985253264 -0500
@@ -677,7 +677,7 @@
     int depth = 0;
     for (javaVFrame *jvf = java_thread->last_java_vframe(&reg_map); jvf != NULL;
          jvf = jvf->java_sender()) {
-      if (depth++ < MaxJavaStackTraceDepth) {  // check for stack too deep
+      if (MaxJavaStackTraceDepth == 0 || depth++ < MaxJavaStackTraceDepth) {  // check for stack too deep
         // add locked objects for this frame into list
         err = get_locked_objects_in_frame(calling_thread, java_thread, jvf, owned_monitors_list, depth-1);
         if (err != JVMTI_ERROR_NONE) {