--- a/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp	Wed May 23 09:43:41 2018 +0200
+++ b/src/hotspot/share/jfr/recorder/storage/jfrStorage.cpp	Wed May 23 15:21:54 2018 +0200
@@ -332,6 +332,7 @@
   assert(age_node->acquired_by_self(), "invariant");
   assert(age_node != NULL, "invariant");
   age_node->set_retired_buffer(buffer);
+  control.increment_full();
   return insert_full_age_node(age_node, age_mspace, thread);
 }
 
@@ -631,6 +632,7 @@
 static void process_age_list(Processor& processor, JfrStorageAgeMspace* age_mspace, JfrAgeNode* head, size_t count) {
   assert(age_mspace != NULL, "invariant");
   assert(head != NULL, "invariant");
+  assert(count > 0, "invariant");
   JfrAgeNode* node = head;
   JfrAgeNode* last = NULL;
   while (node != NULL) {
@@ -669,7 +671,7 @@
     return 0;
   }
   size_t count;
-  JfrAgeNode* head;;
+  JfrAgeNode* head;
   {
     // fetch age list
     MutexLockerEx buffer_lock(JfrBuffer_lock, Mutex::_no_safepoint_check_flag);
@@ -678,6 +680,7 @@
     control.reset_full();
   }
   assert(head != NULL, "invariant");
+  assert(count > 0, "invariant");
   process_age_list(processor, age_mspace, head, count);
   return count;
 }