comparison src/share/vm/prims/jvmtiEnv.cpp @ 20804:7848fc12602b

Merge with jdk8u40-b25
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Tue, 07 Apr 2015 14:58:49 +0200
parents 52b4284cb496 887a7cedb892
children
comparison
equal deleted inserted replaced
20184:84105dcdb05b 20804:7848fc12602b
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "classfile/classLoaderExt.hpp"
26 #include "classfile/systemDictionary.hpp" 27 #include "classfile/systemDictionary.hpp"
27 #include "classfile/vmSymbols.hpp" 28 #include "classfile/vmSymbols.hpp"
28 #include "interpreter/bytecodeStream.hpp" 29 #include "interpreter/bytecodeStream.hpp"
29 #include "interpreter/interpreter.hpp" 30 #include "interpreter/interpreter.hpp"
30 #include "jvmtifiles/jvmtiEnv.hpp" 31 #include "jvmtifiles/jvmtiEnv.hpp"
473 474
474 // add the jar file to the bootclasspath 475 // add the jar file to the bootclasspath
475 if (TraceClassLoading) { 476 if (TraceClassLoading) {
476 tty->print_cr("[Opened %s]", zip_entry->name()); 477 tty->print_cr("[Opened %s]", zip_entry->name());
477 } 478 }
478 ClassLoader::add_to_list(zip_entry); 479 ClassLoaderExt::append_boot_classpath(zip_entry);
479 return JVMTI_ERROR_NONE; 480 return JVMTI_ERROR_NONE;
480 } else { 481 } else {
481 return JVMTI_ERROR_WRONG_PHASE; 482 return JVMTI_ERROR_WRONG_PHASE;
482 } 483 }
483 484