Merge remote-tracking branch 'origin/4.0.x'

spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -158,27 +158,27 @@ public void registerBeans(String name, GenericApplicationContext context) {
 	}
 
 	public GenericApplicationContext buildContext(String name) {
+		// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
+		// https://github.com/spring-cloud/spring-cloud-openfeign/issues/475
+		ClassLoader classLoader = getClass().getClassLoader();
 		GenericApplicationContext context;
 		if (this.parent != null) {
-			// jdk11 issue
-			// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
-			// https://github.com/spring-cloud/spring-cloud-openfeign/issues/475
 			DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 			if (parent instanceof ConfigurableApplicationContext) {
 				beanFactory.setBeanClassLoader(
 						((ConfigurableApplicationContext) parent).getBeanFactory().getBeanClassLoader());
 			}
 			else {
-				beanFactory.setBeanClassLoader(parent.getClassLoader());
+				beanFactory.setBeanClassLoader(classLoader);
 			}
 			context = AotDetector.useGeneratedArtifacts() ? new GenericApplicationContext(beanFactory)
 					: new AnnotationConfigApplicationContext(beanFactory);
-			context.setClassLoader(parent.getClassLoader());
 		}
 		else {
 			context = AotDetector.useGeneratedArtifacts() ? new GenericApplicationContext()
 					: new AnnotationConfigApplicationContext();
 		}
+		context.setClassLoader(classLoader);
 		context.getEnvironment().getPropertySources().addFirst(
 				new MapPropertySource(this.propertySourceName, Collections.singletonMap(this.propertyName, name)));
 		if (this.parent != null) {