Fix #5511: don't anymore rely on CodeSource#getLocation(), instead

obtain the URL of the resource itself via its own class loader
eclipse-ee4j · Oct 19, 2024 · c5319f0 · c5319f0
1 parent 2ae9565
commit c5319f0
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java b/...src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java
@@ -17,6 +17,7 @@
 package com.sun.faces.config.manager.tasks;
 
 import java.net.URI;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
@@ -75,8 +76,14 @@ private void initializeIvars(Set<Class<?>> annotatedSet) {
                         String sourceURIString = sourceURI.toString();
                         if (annotatedSet != null) {
                             for (Class<?> clazz : annotatedSet) {
-                                if (sourceURIString.contains(clazz.getProtectionDomain().getCodeSource().getLocation().toString())) {
-                                    toRemove.add(clazz);
+                                URL resource = clazz.getClassLoader().getResource(clazz.getName().replace(".", "/") + ".class");
+
+                                if (resource != null) {
+                                    String location = resource.toString().split("(?<=\\.jar)[!/].*", 2)[0];
+
+                                    if (sourceURIString.startsWith(location)) {
+                                        toRemove.add(clazz);
+                                    }
                                 }
                             }
                             annotatedSet.removeAll(toRemove);