comparison src/share/vm/classfile/sharedPathsMiscInfo.cpp @ 23660:b5f3a471e646

Merge.
author Doug Simon <doug.simon@oracle.com>
date Wed, 01 Jun 2016 00:11:44 +0200
parents f46ffa934a46
children
comparison
equal deleted inserted replaced
23411:d7cf78885a3a 23660:b5f3a471e646
1 /* 1 /*
2 * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2014, 2015, 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.
65 } 65 }
66 return false; 66 return false;
67 } 67 }
68 68
69 bool SharedPathsMiscInfo::fail(const char* msg, const char* name) { 69 bool SharedPathsMiscInfo::fail(const char* msg, const char* name) {
70 ClassLoader::trace_class_path(msg, name); 70 ClassLoader::trace_class_path(tty, msg, name);
71 MetaspaceShared::set_archive_loading_failed(); 71 MetaspaceShared::set_archive_loading_failed();
72 return false; 72 return false;
73 } 73 }
74 74
75 bool SharedPathsMiscInfo::check() { 75 bool SharedPathsMiscInfo::check() {