Merge pull request #2845 from hangshao0/work

Set module to Java.base before java.base is created.
eclipse-openj9 · Sep 14, 2018 · 03219bd · 03219bd
2 parents ad838af + 186941d
commit 03219bd
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/runtime/vm/createramclass.cpp b/runtime/vm/createramclass.cpp
@@ -2803,14 +2803,10 @@ internalCreateRAMClassFromROMClass(J9VMThread *vmThread, J9ClassLoader *classLoa
 					module = javaVM->unamedModuleForSystemLoader;
 				}
 			} else {
-				if (J9ROMCLASS_IS_PRIMITIVE_TYPE(romClass)
-					|| (LOAD_LOCATION_PATCH_PATH == locationType)
-					|| (LOAD_LOCATION_MODULE == locationType)
-				) {
-					module = javaVM->javaBaseModule;
-				} else {
-					module = javaVM->unamedModuleForSystemLoader;
-				}
+				/* Ignore locationType and assign all classes created before the java.base module is created to java.base.
+				 * This matches the RI implementation. Validated on JDK9 through JDK11.
+				 */
+				module = javaVM->javaBaseModule;
 			}
 		}
 	}