(aries-rsa) branch master updated: ARIES-2231 Fix MethodInvoker CNFE when interface is implemented by service superclass

[amichai]

This is an automated email from the ASF dual-hosted git repository.

amichair pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git


The following commit(s) were added to refs/heads/master by this push:
     new 11f6700d ARIES-2231 Fix MethodInvoker CNFE when interface is 
implemented by service superclass
11f6700d is described below

commit 11f6700df021f62a3f032f43128613207453ac34
Author: Amichai Rothman <amic...@apache.org>
AuthorDate: Wed Jun 3 19:54:07 2026 +0300

    ARIES-2231 Fix MethodInvoker CNFE when interface is implemented by service 
superclass
---
 .../aries/rsa/provider/tcp/MethodInvoker.java      | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git 
a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/MethodInvoker.java
 
b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/MethodInvoker.java
index 65d625f6..c47bc9ee 100644
--- 
a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/MethodInvoker.java
+++ 
b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/MethodInvoker.java
@@ -19,7 +19,6 @@
 package org.apache.aries.rsa.provider.tcp;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -54,19 +53,22 @@ public class MethodInvoker {
     }
 
     public MethodInvoker(Object service, List<String> interfaces) {
-        this(service, loadClasses(interfaces, 
service.getClass().getClassLoader()));
+        this(service, interfaces.stream().map(iface -> toClass(iface, 
service.getClass())).toArray(Class<?>[]::new));
     }
 
-    private static Class<?>[] loadClasses(List<String> interfaces, ClassLoader 
loader) {
-        List<Class<?>> classes = new ArrayList<>();
-        for (String iface : interfaces) {
-            try {
-                classes.add(loader.loadClass(iface));
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException(e);
+    private static Class<?> toClass(String iface, Class<?> serviceClass) {
+        // find the interface class by name using the class of the service
+        // that implements it as well as all of its superclasses (which
+        // may come from a different bundle - the service classloader is not 
enough)
+        for (Class<?> cls = serviceClass; cls != null; cls = 
cls.getSuperclass()) {
+            for (Class<?> c : cls.getInterfaces()) {
+                if (c.getName().equals(iface)) {
+                    return c;
+                }
             }
         }
-        return classes.toArray(new Class<?>[0]);
+        throw new RuntimeException("service of type " + 
serviceClass.getSimpleName()
+            + " does not implement interface " + iface);
     }
 
     public Object getService() {