--- a/hotspot/src/share/vm/classfile/moduleEntry.hpp Sun Sep 18 21:10:48 2016 -0400
+++ b/hotspot/src/share/vm/classfile/moduleEntry.hpp Mon Sep 19 12:04:28 2016 -0400
@@ -78,11 +78,11 @@
_must_walk_reads = false;
}
- Symbol* name() const { return literal(); }
- void set_name(Symbol* n) { set_literal(n); }
+ Symbol* name() const { return literal(); }
+ void set_name(Symbol* n) { set_literal(n); }
- jobject module() const { return _module; }
- void set_module(jobject j) { _module = j; }
+ jobject module() const { return _module; }
+ void set_module(jobject j) { _module = j; }
// The shared ProtectionDomain reference is set once the VM loads a shared class
// originated from the current Module. The referenced ProtectionDomain object is
@@ -217,13 +217,13 @@
// Special handling for unnamed module, one per class loader's ModuleEntryTable
void create_unnamed_module(ClassLoaderData* loader_data);
- ModuleEntry* unnamed_module() { return _unnamed_module; }
+ ModuleEntry* unnamed_module() { return _unnamed_module; }
// Special handling for java.base
- static ModuleEntry* javabase_module() { return _javabase_module; }
- static void set_javabase_module(ModuleEntry* java_base) { _javabase_module = java_base; }
- static bool javabase_defined() { return ((_javabase_module != NULL) &&
- (_javabase_module->module() != NULL)); }
+ static ModuleEntry* javabase_moduleEntry() { return _javabase_module; }
+ static void set_javabase_moduleEntry(ModuleEntry* java_base) { _javabase_module = java_base; }
+ static bool javabase_defined() { return ((_javabase_module != NULL) &&
+ (_javabase_module->module() != NULL)); }
static void finalize_javabase(Handle module_handle, Symbol* version, Symbol* location);
static void patch_javabase_entries(Handle module_handle);