OpenJDK / valhalla / valhalla
changeset 59178:8cc162bd3671 nestmates
Summary: fix minor merge issue
Reviewed-by: lfoltan
author | hseigel |
---|---|
date | Wed, 04 Mar 2020 16:08:30 +0000 |
parents | 0c8de4cd12e5 |
children | e624ea4194e9 |
files | src/hotspot/share/classfile/classLoaderData.cpp |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/classfile/classLoaderData.cpp Mon Mar 02 20:25:51 2020 +0000 +++ b/src/hotspot/share/classfile/classLoaderData.cpp Wed Mar 04 16:08:30 2020 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -128,8 +128,8 @@ ClassLoaderData::ClassLoaderData(Handle h_class_loader, bool is_shortlived) : _metaspace(NULL), - _metaspace_lock(new Mutex(Monitor::leaf+1, "Metaspace allocation lock", true, - Monitor::_safepoint_check_never)), + _metaspace_lock(new Mutex(Mutex::leaf+1, "Metaspace allocation lock", true, + Mutex::_safepoint_check_never)), _unloading(false), _is_shortlived(is_shortlived), _modified_oops(true), _accumulated_modified_oops(false), // An unsafe anonymous class loader data doesn't have anything to keep