Only look for a provider() method if service provider class is in an …

…explicit module.
oracle · Apr 25, 2024 · 23f22dc · 23f22dc
1 parent 5922877
commit 23f22dc
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ServiceLoaderFeature.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ServiceLoaderFeature.java
@@ -191,15 +191,18 @@ void handleServiceClassIsReachable(DuringAnalysisAccess access, Class<?> service
             Constructor<?> nullaryConstructor = null;
             Method nullaryProviderMethod = null;
             try {
-                for (Method method : providerClass.getDeclaredMethods()) {
-                    if (Modifier.isPublic(method.getModifiers()) && Modifier.isStatic(method.getModifiers()) &&
-                                    method.getParameterCount() == 0 && method.getName().equals("provider")) {
-                        if (nullaryProviderMethod == null) {
-                            nullaryProviderMethod = method;
-                        } else {
-                            /* There must be at most one public static provider() method. */
-                            nullaryProviderMethod = null;
-                            break;
+                /* Only look for a provider() method if provider class is in an explicit module. */
+                if (providerClass.getModule().isNamed() && !providerClass.getModule().getDescriptor().isAutomatic()) {
+                    for (Method method : providerClass.getDeclaredMethods()) {
+                        if (Modifier.isPublic(method.getModifiers()) && Modifier.isStatic(method.getModifiers()) &&
+                                        method.getParameterCount() == 0 && method.getName().equals("provider")) {
+                            if (nullaryProviderMethod == null) {
+                                nullaryProviderMethod = method;
+                            } else {
+                                /* There must be at most one public static provider() method. */
+                                nullaryProviderMethod = null;
+                                break;
+                            }
                         }
                     }
                 }