--- a/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp	Sun Aug 25 10:12:57 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointManager.cpp	Sun Aug 25 13:27:54 2019 +0200
@@ -408,7 +408,9 @@
 }
 
 size_t JfrCheckpointManager::flush_type_set() {
-  return JfrTypeManager::flush_type_set();
+  const size_t elements = JfrTypeManager::flush_type_set();
+  flush();
+  return elements;
 }
 
 void JfrCheckpointManager::create_thread_checkpoint(Thread* t) {