Fix ClassCastException in extractAndWrapCause when handling ExecutionException

Signed-off-by: Yechan Lim <[email protected]>

Author: wonthechan

CHANGELOG.md

@@ -52,7 +52,7 @@ This section is for maintaining a changelog for all breaking changes for the cli
 ### Removed
 
 ### Fixed
-
+- Fixed ClassCastException in extractAndWrapCause when handling ExecutionException
 ### Security
 
 ## [2.22.0] - 03/05/2025

java-client/src/main/java/org/opensearch/client/transport/aws/AwsSdk2Transport.java

@@ -694,7 +694,11 @@ private static Exception extractAndWrapCause(Exception exception) {
             if (t instanceof Error) {
                 throw (Error) t;
             }
-            exception = (Exception) t;
+            if (t instanceof Exception) {
+                exception = (Exception) t;
+            } else {
+                exception = new RuntimeException("Unexpected throwable caught in execution", t);
+            }
         }
         if (exception instanceof SocketTimeoutException) {
             SocketTimeoutException e = new SocketTimeoutException(exception.getMessage());

java-client/src/main/java/org/opensearch/client/transport/httpclient5/ApacheHttpClient5Transport.java

@@ -1107,7 +1107,11 @@ private static Exception extractAndWrapCause(Exception exception) {
             if (t instanceof Error) {
                 throw (Error) t;
             }
-            exception = (Exception) t;
+            if (t instanceof Exception) {
+                exception = (Exception) t;
+            } else {
+                exception = new RuntimeException("Unexpected throwable caught in execution", t);
+            }
         }
         if (exception instanceof ConnectTimeoutException) {
             ConnectTimeoutException e = new ConnectTimeoutException(exception.getMessage());