Unwrap the actual failure from JsonRPC if it's wrapped

jmartisk · Feb 22, 2024 · a0c8165 · a0c8165
1 parent 44d5b77
commit a0c8165
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/...nsions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcRouter.java b/...nsions/vertx-http/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcRouter.java
@@ -1,5 +1,6 @@
 package io.quarkus.devui.runtime.comms;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -206,7 +207,19 @@ private void route(JsonRpcRequest jsonRpcRequest, ServerWebSocket s) {
                                         MessageType.Response);
                             }
                         }, failure -> {
-                            codec.writeErrorResponse(s, jsonRpcRequest.getId(), jsonRpcMethodName, failure);
+                            Throwable actualFailure;
+                            // If the jsonrpc method is actually
+                            // synchronous, the failure is wrapped in an
+                            // InvocationTargetException, so unwrap it here
+                            if (failure instanceof InvocationTargetException f) {
+                                actualFailure = f.getTargetException();
+                            } else if (failure.getCause() != null
+                                    && failure.getCause() instanceof InvocationTargetException f) {
+                                actualFailure = f.getTargetException();
+                            } else {
+                                actualFailure = failure;
+                            }
+                            codec.writeErrorResponse(s, jsonRpcRequest.getId(), jsonRpcMethodName, actualFailure);
                         });
             }
         } else {