# HG changeset patch # User Thomas Wuerthinger # Date 1331232591 -3600 # Node ID 227aa994f05816da19b92c67c1c3d966af47c2fa # Parent 8a88c903e3811f9af62b39137655c2150f43e9b0 Two more package name corrections in C++ part. diff -r 8a88c903e381 -r 227aa994f058 src/share/vm/graal/graalVMToCompiler.cpp --- a/src/share/vm/graal/graalVMToCompiler.cpp Thu Mar 08 19:35:42 2012 +0100 +++ b/src/share/vm/graal/graalVMToCompiler.cpp Thu Mar 08 19:49:51 2012 +0100 @@ -32,7 +32,7 @@ KlassHandle VMToCompiler::vmExitsKlass() { if (JNIHandles::resolve(_vmExitsPermKlass) == NULL) { klassOop result = SystemDictionary::resolve_or_null(vmSymbols::com_oracle_graal_hotspot_bridge_VMToCompiler(), SystemDictionary::java_system_loader(), NULL, Thread::current()); - check_not_null(result, "Couldn't find class com.oracle.max.graal.hotspot.bridge.VMToCompiler"); + check_not_null(result, "Couldn't find class com.oracle.graal.hotspot.bridge.VMToCompiler"); _vmExitsPermKlass = JNIHandles::make_global(result); } return KlassHandle((klassOop)JNIHandles::resolve_non_null(_vmExitsPermKlass)); diff -r 8a88c903e381 -r 227aa994f058 src/share/vm/runtime/arguments.cpp --- a/src/share/vm/runtime/arguments.cpp Thu Mar 08 19:35:42 2012 +0100 +++ b/src/share/vm/runtime/arguments.cpp Thu Mar 08 19:49:51 2012 +0100 @@ -2133,7 +2133,7 @@ errno = 0; DIR* graal_dir_handle = os::opendir(graal_dir); while ((dentry = os::readdir(graal_dir_handle, (struct dirent *)tdbuf)) != NULL) { - if (strcmp(dentry->d_name, ".") != 0 && strcmp(dentry->d_name, "..") != 0 && strcmp(dentry->d_name, "com.oracle.max.graal.tests") != 0 && strcmp(dentry->d_name, "com.oracle.max.graal.jtt") != 0) { + if (strcmp(dentry->d_name, ".") != 0 && strcmp(dentry->d_name, "..") != 0 && strcmp(dentry->d_name, "com.oracle.graal.tests") != 0 && strcmp(dentry->d_name, "com.oracle.graal.jtt") != 0) { prepend_to_graal_classpath(scp_compiler, graal_dir, dentry->d_name); if (PrintVMOptions) { tty->print_cr("Adding project directory %s to bootclasspath", dentry->d_name);