Merge pull request #6460 from ctabin/fix-multirelease-jar-lookup

FISH-7959: Fixes MultiRelease JAR lookup for specific version classes
payara · Nov 1, 2023 · 544a5eb · 544a5eb
2 parents 3d835af + cc1f872
commit 544a5eb
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/nucleus/common/common-util/src/main/java/com/sun/enterprise/loader/ASURLClassLoader.java b/nucleus/common/common-util/src/main/java/com/sun/enterprise/loader/ASURLClassLoader.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
- // Portions Copyright [2016-2020] [Payara Foundation and/or its affiliates]
+ // Portions Copyright [2016-2023] [Payara Foundation and/or its affiliates]
 
 package com.sun.enterprise.loader;
 
@@ -614,22 +614,36 @@ private byte[] loadClassData0(final URLEntry res, final String entryName) {
             try {
                 if (res.isJar) { // It is a jarfile..
                     JarFile zip = res.zip;
-                    JarEntry entry = zip.getJarEntry(entryName);
+                    JarFile jar = new JarFile(res.file, false, JarFile.OPEN_READ,
+                            Runtime.Version.parse(System.getProperty("java.version")));
+                    JarEntry entry = jar.getJarEntry(entryName);
                     if (entry != null) {
-                        InputStream classStream = zip.getInputStream(entry);
-                        byte[] classData = getClassData(classStream);
+                        byte[] classData = getClassData(zip.getInputStream(entry));
                         res.setProtectionDomain(ASURLClassLoader.this, entry.getCertificates());
                         return classData;
                     }
                 } else { // Its a directory....
-                    File classFile = new File (res.file, entryName.replace('/', File.separatorChar));
+                    String entryPath = entryName.replace('/', File.separatorChar);
+                    File classFile = new File (res.file, entryPath);
                     if (classFile.exists()) {
                         try (InputStream classStream = new FileInputStream(classFile)) {
                             byte[] classData = getClassData(classStream);
                             res.setProtectionDomain(ASURLClassLoader.this, null);
                             return classData;
                         }
                     }
+
+                    File multiVersionDir = new File(res.file, "META-INF/versions/");
+                    if (multiVersionDir.exists()) {
+                        File multiVersionClassFile = new File(multiVersionDir, entryPath);
+                        if (multiVersionClassFile.exists()) {
+                            try (InputStream classStream = new FileInputStream(multiVersionClassFile)) {
+                                byte[] classData = getClassData(classStream);
+                                res.setProtectionDomain(ASURLClassLoader.this, null);
+                                return classData;
+                            }
+                        }
+                    }
                 }
             } catch (IOException ioe) {
                 _logger.log(Level.INFO, CULoggerInfo.exceptionInASURLClassLoader, ioe);