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 index caabda6afb..417b900b1c 100644 --- 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,12 +110,12 @@ 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(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(id)); return id; } @@ -123,7 +123,7 @@ public static String generateClassLoderId(Class clazz) { 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(id)); return id; } diff --git a/loader/build.xml b/loader/build.xml index 988d474734..a01520fc41 100644 --- a/loader/build.xml +++ b/loader/build.xml @@ -2,7 +2,7 @@ - + diff --git a/loader/pom.xml b/loader/pom.xml index 16922731d8..9c543a9ca4 100644 --- a/loader/pom.xml +++ b/loader/pom.xml @@ -3,7 +3,7 @@ org.lucee lucee - 6.2.0.102-SNAPSHOT + 6.2.0.103-SNAPSHOT jar Lucee Loader Build