From b38ce54410af8fc62d8ae6fe694b580e509ae73a Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Thu, 14 Feb 2019 15:54:27 -0500
Subject: [PATCH] Sets the child class loader to parent class loader.

This prevents odd behavior in jdk 11 +

Fixes https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
---
 .../cloud/context/named/NamedContextFactory.java          | 3 +++
 .../cloud/context/named/NamedContextFactoryTests.java     | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
index 57538878..4fc16fbf 100644
--- a/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
+++ b/spring-cloud-context/src/main/java/org/springframework/cloud/context/named/NamedContextFactory.java
@@ -128,6 +128,9 @@ public abstract class NamedContextFactory<C extends NamedContextFactory.Specific
 		if (this.parent != null) {
 			// Uses Environment from parent as well as beans
 			context.setParent(this.parent);
+			// jdk11 issue
+			// https://github.com/spring-cloud/spring-cloud-netflix/issues/3101
+			context.setClassLoader(this.parent.getClassLoader());
 		}
 		context.setDisplayName(generateDisplayName(name));
 		context.refresh();
diff --git a/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java b/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java
index 1285add3..ed56e9da 100644
--- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/named/NamedContextFactoryTests.java
@@ -19,6 +19,7 @@ package org.springframework.cloud.context.named;
 import java.util.Arrays;
 import java.util.Map;
 
+import org.assertj.core.api.Assertions;
 import org.junit.Test;
 
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -65,6 +66,13 @@ public class NamedContextFactoryTests {
 		AnnotationConfigApplicationContext fooContext = factory.getContext("foo");
 		AnnotationConfigApplicationContext barContext = factory.getContext("bar");
 
+		then(fooContext.getClassLoader())
+				.as("foo context classloader does not match parent")
+				.isSameAs(parent.getClassLoader());
+
+		Assertions.assertThat(fooContext).hasFieldOrPropertyWithValue("customClassLoader",
+				true);
+
 		factory.destroy();
 
 		then(fooContext.isActive()).as("foo context wasn't closed").isFalse();