Merge branch '6.1' into 6.2

# Conflicts: # loader/build.xml # loader/pom.xml
lucee · Oct 13, 2024 · ed882c2 · ed882c2
2 parents cb04668 + 03004fd
commit ed882c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/java/lucee/transformer/dynamic/meta/dynamic/ClazzDynamic.java b/core/src/main/java/lucee/transformer/dynamic/meta/dynamic/ClazzDynamic.java
@@ -95,9 +95,9 @@ public static ClazzDynamic getInstance(Class clazz, Resource dir, Log log) throw
 
 	public static String generateClassLoderId(Class<?> clazz) {
 		ClassLoader cl = clazz.getClassLoader();
-
+		String jv = HashUtil.create64BitHashAsString(System.getProperty("java.version"), Character.MAX_RADIX);
 		if (cl == null) {
-			if (systemId == null) systemId = "s" + HashUtil.create64BitHashAsString(System.getProperty("java.version"), Character.MAX_RADIX);
+			if (systemId == null) systemId = "s" + jv;
 			return systemId;
 		}
 
@@ -110,20 +110,20 @@ public static String generateClassLoderId(Class<?> clazz) {
 
 		if (cl instanceof BundleClassLoader) {
 			Bundle b = ((BundleClassLoader) cl).getBundle();
-			id = "b" + HashUtil.create64BitHashAsString(b.getSymbolicName() + ":" + b.getVersion(), Character.MAX_RADIX);
+			id = "b" + HashUtil.create64BitHashAsString(b.getSymbolicName() + ":" + b.getVersion() + ":" + jv, Character.MAX_RADIX);
 			clids.put(cl, new SoftReference<String>(id));
 			return id;
 		}
 		if (cl instanceof PhysicalClassLoader) {
-			id = "p" + HashUtil.create64BitHashAsString(((PhysicalClassLoader) cl).getDirectory().getAbsolutePath(), Character.MAX_RADIX);
+			id = "p" + HashUtil.create64BitHashAsString(((PhysicalClassLoader) cl).getDirectory().getAbsolutePath() + ":" + jv, Character.MAX_RADIX);
 			clids.put(cl, new SoftReference<String>(id));
 			return id;
 		}
 
 		ProtectionDomain protectionDomain = clazz.getProtectionDomain();
 		CodeSource codeSource = protectionDomain.getCodeSource();
 		if (codeSource != null && codeSource.getLocation() != null) {
-			id = "j" + HashUtil.create64BitHashAsString(codeSource.getLocation().toString(), Character.MAX_RADIX);
+			id = "j" + HashUtil.create64BitHashAsString(codeSource.getLocation().toString() + ":" + jv, Character.MAX_RADIX);
 			clids.put(cl, new SoftReference<String>(id));
 			return id;
 		}

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.102-SNAPSHOT"/>
+  <property name="version" value="6.2.0.103-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.102-SNAPSHOT</version>
+  <version>6.2.0.103-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>