Merge pull request #18435 from keithc-ca/loader

Tolerate null in getLoaderNameID()
eclipse-openj9 · Nov 9, 2023 · 3126552 · 3126552
2 parents f7cf540 + 086db59
commit 3126552
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/jcl/src/java.base/share/classes/java/lang/Access.java b/jcl/src/java.base/share/classes/java/lang/Access.java
@@ -720,6 +720,9 @@ public <T> void setCarrierThreadLocal(CarrierThreadLocal<T> carrierThreadlocal,
 /*[IF JAVA_SPEC_VERSION >= 11]*/
 	@Override
 	public String getLoaderNameID(ClassLoader loader) {
+		if (loader == null) {
+			return "null";
+		}
 		StringBuilder buffer = new StringBuilder();
 		String name = loader.getName();