src/hotspot/share/cds/aotStreamedHeapLoader.cpp

*** 796,10 ***
--- 796,14 ---
      }
      Universe::vm_global()->release(&handles[num_null_handles], num_handles - num_null_handles);
    }
  
    FREE_C_HEAP_ARRAY(void*, _object_index_to_heap_object_table);
+   // Leyden: Temp fix for JDK-8371655 {
+   _object_index_to_heap_object_table = nullptr;
+   _roots_archive = nullptr;
+   // }
  
    // Unmap regions
    FileMapInfo::current_info()->unmap_region(AOTMetaspace::hp);
    FileMapInfo::current_info()->unmap_region(AOTMetaspace::bm);