(aries-rsa) 05/05: Change TcpInvocationHandler to use supplyAsync instead of creating unmanaged threads

[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

commit d33f1d47705b8187a12a58aff6eeb8d53c6a1cd5
Author: Amichai Rothman <amic...@apache.org>
AuthorDate: Mon Mar 30 01:07:03 2026 +0300

    Change TcpInvocationHandler to use supplyAsync instead of creating 
unmanaged threads
---
 .../rsa/provider/tcp/TcpInvocationHandler.java     | 37 ++++++++++------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git 
a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpInvocationHandler.java
 
b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpInvocationHandler.java
index 998b53ad..fee48dd3 100644
--- 
a/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpInvocationHandler.java
+++ 
b/provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp/TcpInvocationHandler.java
@@ -32,9 +32,9 @@ import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.Future;
-import java.util.function.Supplier;
 
 import org.apache.aries.rsa.provider.tcp.ser.BasicObjectInputStream;
 import org.apache.aries.rsa.provider.tcp.ser.BasicObjectOutputStream;
@@ -85,8 +85,7 @@ public class TcpInvocationHandler implements 
InvocationHandler, Closeable {
     private boolean closed;
 
     TcpInvocationHandler(SocketFactory socketFactory, ClassLoader cl,
-            String host, int port, String endpointId, int timeoutMillis)
-            throws UnknownHostException, IOException {
+            String host, int port, String endpointId, int timeoutMillis) {
         this.socketFactory = socketFactory;
         this.cl = cl;
         this.host = host;
@@ -206,32 +205,28 @@ public class TcpInvocationHandler implements 
InvocationHandler, Closeable {
     }
 
     private Object createFutureResult(final Method method, final Object[] 
args) {
-        return CompletableFuture.supplyAsync(new Supplier<Object>() {
-            public Object get() {
-                try {
-                    return handleSyncCall(method, args);
-                } catch (RuntimeException e) {
-                    throw e;
-                } catch (Throwable e) {
-                    throw new RuntimeException(e);
-                }
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                return handleSyncCall(method, args);
+            } catch (RuntimeException e) {
+                throw e;
+            } catch (Throwable e) {
+                throw new RuntimeException(e);
             }
         });
     }
 
     private Object createPromiseResult(final Method method, final Object[] 
args) {
         final Deferred<Object> deferred = new Deferred<>();
-        new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try {
-                    deferred.resolve(handleSyncCall(method, args));
-                } catch (Throwable e) {
+        ((CompletionStage<?>) createFutureResult(method, args))
+            .whenComplete((result, e) -> {
+                if (e == null) {
+                    deferred.resolve(result);
+                } else {
+                    e = e instanceof CompletionException ? e.getCause() : e;
                     deferred.fail(e);
                 }
-            }
-        }).start();
+            });
         return deferred.getPromise();
     }