equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1997, 2016, 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. |
492 // Null out class_loader_data because we don't share that yet. |
492 // Null out class_loader_data because we don't share that yet. |
493 set_class_loader_data(NULL); |
493 set_class_loader_data(NULL); |
494 } |
494 } |
495 |
495 |
496 void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) { |
496 void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) { |
497 TRACE_INIT_ID(this); |
497 TRACE_INIT_KLASS_ID(this); |
498 // If an exception happened during CDS restore, some of these fields may already be |
498 // If an exception happened during CDS restore, some of these fields may already be |
499 // set. We leave the class on the CLD list, even if incomplete so that we don't |
499 // set. We leave the class on the CLD list, even if incomplete so that we don't |
500 // modify the CLD list outside a safepoint. |
500 // modify the CLD list outside a safepoint. |
501 if (class_loader_data() == NULL) { |
501 if (class_loader_data() == NULL) { |
502 // Restore class_loader_data to the null class loader data |
502 // Restore class_loader_data to the null class loader data |