do not inherit javasettings when the component defines javasettings

lucee · Oct 10, 2024 · 60224ea · 60224ea
1 parent dd36ea4
commit 60224ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/core/src/main/java/lucee/runtime/PageContextImpl.java b/core/src/main/java/lucee/runtime/PageContextImpl.java
@@ -360,6 +360,7 @@ public final class PageContextImpl extends PageContext {
 	private StackTraceElement[] timeoutStacktrace;
 
 	private static final boolean READ_CFID_FROM_URL = Caster.toBooleanValue(SystemUtil.getSystemPropOrEnvVar("lucee.read.cfid.from.url", "true"), true);
+	private static final boolean INHERIT_JAVA_SETTINGS = false;
 	private static AtomicInteger _idCounter = new AtomicInteger(1);
 	private long lastTimeoutNoAction;
 
@@ -3857,7 +3858,8 @@ public ClassLoader getRPCClassLoader(boolean reload, JavaSettings customJS) thro
 		if (ac instanceof ComponentImpl) {
 			JavaSettings js = ((ComponentImpl) ac).getJavaSettings(this);
 			if (js != null) {
-				cl = config.getRPCClassLoader(reload, js, cl);
+				if (INHERIT_JAVA_SETTINGS) cl = config.getRPCClassLoader(reload, js, cl);
+				else cl = config.getRPCClassLoader(reload, js, null);
 			}
 		}
 

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.97-SNAPSHOT"/>
+  <property name="version" value="6.2.0.98-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.97-SNAPSHOT</version>
+  <version>6.2.0.98-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>