Support for shared GroovyClassLoader in GroovyScriptFactory

Closes spring-projectsgh-25177
zx20110729 · Feb 18, 2022 · cca1d86 · cca1d86
1 parent 3a1356f
commit cca1d86
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java b/spring-context/src/main/java/org/springframework/scripting/groovy/GroovyScriptFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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,7 +158,14 @@ public void setBeanFactory(BeanFactory beanFactory) {
 
 	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.groovyClassLoader = buildGroovyClassLoader(classLoader);
+		if (classLoader instanceof GroovyClassLoader &&
+				(this.compilerConfiguration == null ||
+						((GroovyClassLoader) classLoader).hasCompatibleConfiguration(this.compilerConfiguration))) {
+			this.groovyClassLoader = (GroovyClassLoader) classLoader;
+		}
+		else {
+			this.groovyClassLoader = buildGroovyClassLoader(classLoader);
+		}
 	}
 
 	/**