equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
325 restore_vtable(); |
325 restore_vtable(); |
326 |
326 |
327 if (SystemDictionary::Object_klass_loaded()) { |
327 if (SystemDictionary::Object_klass_loaded()) { |
328 ClassLoaderData* loader_data = pool_holder()->class_loader_data(); |
328 ClassLoaderData* loader_data = pool_holder()->class_loader_data(); |
329 #if INCLUDE_CDS_JAVA_HEAP |
329 #if INCLUDE_CDS_JAVA_HEAP |
330 if (MetaspaceShared::open_archive_heap_region_mapped()) { |
330 if (MetaspaceShared::open_archive_heap_region_mapped() && |
|
331 _cache->archived_references() != NULL) { |
331 oop archived = _cache->archived_references(); |
332 oop archived = _cache->archived_references(); |
332 if (archived != NULL) { |
333 // Create handle for the archived resolved reference array object |
333 // Create handle for the archived resolved reference array object |
334 Handle refs_handle(THREAD, archived); |
334 Handle refs_handle(THREAD, archived); |
335 set_resolved_references(loader_data->add_handle(refs_handle)); |
335 set_resolved_references(loader_data->add_handle(refs_handle)); |
|
336 } |
|
337 } else |
336 } else |
338 #endif |
337 #endif |
339 { |
338 { |
340 // No mapped archived resolved reference array |
339 // No mapped archived resolved reference array |
341 // Recreate the object array and add to ClassLoaderData. |
340 // Recreate the object array and add to ClassLoaderData. |