--- old/src/share/vm/runtime/java.cpp	2016-10-25 10:40:09.971778053 +0200
+++ new/src/share/vm/runtime/java.cpp	2016-10-25 10:40:09.924778022 +0200
@@ -59,6 +59,8 @@
 #include "runtime/vm_operations.hpp"
 #include "services/memTracker.hpp"
 #include "trace/tracing.hpp"
+#include "evtrace/traceEvents.hpp"
+#include "evtrace/traceManager.hpp"
 #include "utilities/dtrace.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/histogram.hpp"
@@ -486,6 +488,13 @@
     os::infinite_sleep();
   }
 
+  if (EnableEventTracing)
+  {
+    HandleMark hm;
+    EXCEPTION_MARK;
+    TraceManager::finish_and_destroy(CHECK);
+  }
+
   // Terminate watcher thread - must before disenrolling any periodic task
   if (PeriodicTask::num_tasks() > 0)
     WatcherThread::stop();